On Wednesday 28 September 2005 19:29, Albert Reiner wrote: > Hi, > > not a problem, I'm just trying to understand darcs a little better > (using 1.0.3 (release)).
> v v v v v v v > foobar > ^ ^ ^ ^ ^ ^ ^ > > (with only 2^0 versions) when the conflicting patches agree that > "foobar" is correct. More correctly; both changed it to the same text. This may seem to be telling the same thing; but if you have two people that changed "Version=40" to Version="41" changes are that the correct resolution of the conflict is to set it to 42. > A couple of hours ago, however, a pull just resulted in a first for > me: multiple **** markers (with 2^2 different versions): > > $ egrep 'v v v|\*\*\*|\^ \^ \^' nw/ar-soft-scoza.nw > v v v v v v v > ************* > ************* > ************* > ^ ^ ^ ^ ^ ^ ^ > ... > > My interpretation (which seems to be consistent with the versions in > the file) is that there must be two pairs of conflicting patches > affecting overlapping sets of lines, and the four versions are > basically the direct product of all possibilities of reconciling those > patches. Is that correct? AFAIK Yes. > Anyway, at first I was a bit worried when pulling took longer than > usual; and then I was very much delighted at the result darcs produced. > Thanks for a great tool! -- Thomas Zander
pgpkIkrs60bhq.pgp
Description: PGP signature
_______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
