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

David Roundy droundy at abridgegame.org
Sun Nov 28 13:31:01 UTC 2004

On Sun, Nov 28, 2004 at 02:33:26AM +1000, Anthony Towns wrote:
> David Roundy wrote:
> >On Sat, Nov 27, 2004 at 11:03:46PM +1000, Anthony Towns wrote:
> >>So in spite of having the _exact same_ inventory in the new repository
> >>as in the original one, we've got completely different contents.
> >The key thing here is that it's only the working directories that
> >differ.  You can make them identical by running revert and resolve.
> Nope -- I've attached a script for duplicating the issue. Run it in a 
> scratch directory and it'll do all the work. ./x is the initial 
> repository, ./a and ./b are the conflicting patches, ./c is the markers 
> for good measure, ./y is a pull from ./x in reverse order to demonstrate 
> commuting works fine; ./z is a pull from ./a, ./b, ./c, ./x in that 
> order. ./z is where the conflicts show up. revert/resolve don't do 
> anything useful in this case.

Thanks for pointing this out!

It turned out to be a bug in the hunk commutation.  :( I believe I've fixed
the problem, but lots of testing would be good.
David Roundy
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.osuosl.org/pipermail/darcs-users/attachments/20041128/79dce8e6/attachment.pgp 

More information about the darcs-users mailing list