[darcs-users] User interface for conflicts: confusing enough to lose data

David Roundy droundy at abridgegame.org
Tue Jul 27 10:23:07 UTC 2004


On Mon, Jul 26, 2004 at 08:58:22PM -0400, Andrew Pimlott wrote:
> [Replying to old mail.]
>
> > > In summary, just doing ``darcs pull; darcs revert'' will make
> > > conflicts impossible to note by any of the official tools in darcs.
> 
> One workaround is to pull the whole repository into an empty repo.
>
> > It would probably be a good idea to add a "re-resolve conflicts" command of
> > some sort.  This wouldn't be too hard to code, but I'm not sure what I'd
> > call it.
> 
> Sounds useful.

I've implemented a "darcs resolve" command which does just this.

> > Because looking for unresolved conflicts is slow, we don't want to do it if
> > we can possibly avoid it.
> 
> Possibly there could simply be an "unresolved conflicts" flag.

Possibly... that would certainly alleviate some of the pain, but we'd still
need to do the slow check to *find* the conflicts if the flag is set.
-- 
David Roundy
http://www.abridgegame.org




More information about the darcs-users mailing list