[darcs-users] Re: Darcs spins

[Andrew Pimlott]

On Mon, Oct 25, 2004 at 01:21:14PM +0000, John Goerzen wrote:
> On 2004-10-25, Mark Stosberg <mark at summersault.com> wrote:
> > On 2004-10-25, John Goerzen <jgoerzen at complete.org> wrote:
> >> I couldn't really find anything on conflict resolution (without some
> >> sort of external command) in the docs... pointers?
> >
> > What version of darcs are you using? Are you seeing "Conflicts in
> > pending", or conflicts in particular files? 
> 
> I have 1.0.0rc3.  I'm seeing conflicts in particular files, and the
> situation I have here is that the patches I'm pulling may try to create
> a file that already exists, or at some point in their history created a
> file that already exists, but in later patches that I'm pulling, deleted
> it.

This may (I haven't followed closely) be a effect of the way darcs
resolves namespace conflicts.  As David described, "The current code
just picks one path through the conflict essentially at random" when it
can do so without breaking symmetry.  Are there any files ending in
"-conflict" around?

See

    http://www.abridgegame.org/pipermail/darcs-users/2004-September/003227.html

and the rest of the thread.

Andrew