[darcs-users] Colin Walters blogs on Arch changesets vs Darcs

Andrew Pimlott andrew at pimlott.net
Fri Nov 26 03:31:45 UTC 2004


On Thu, Nov 25, 2004 at 09:40:27AM -0400, Zooko O'Whielacronx wrote:
> Okay here is the cutnpaste.  What I wanted was for darcs to say "No 
> changes!" after I pulled the identical duplicate patch from one repo to 
> the other.  Instead it gave a merge conflict.  By the way, when I 
> reverted the change, it got into a state that looks wrong to me -- both 
> patches are present, and there are no merge conflicts or unrecorded 
> changes, but the file doesn't exist.  Bug?

Think symmetry.

The repo has to be in some state after the conflict, and what other
state makes sense?  Moreover, given a better conflict-handling UI, users
would never notice this curious situation.

Andrew




More information about the darcs-users mailing list