Hi all, > nas = apply_to_filepaths False (invert pmerged) nms
I'm not sure I understand this code. This is supposed to be a list of files in the ancestor to both version1 and version2 of a conflict. nms is the basically the merged version. If I understand correctly, this means (p1 pmerged), where pmerged is like p2 but commuted. To get the ancestor back, why is (invert pmerged) sufficient? Don't we also need to follow up with (invert p1)? Thanks, -- Eric Kow http://www.loria.fr/~kow PGP Key ID: 08AC04F9 Merci de corriger mon français.
pgpr64HBM57xv.pgp
Description: PGP signature
_______________________________________________ darcs-devel mailing list [email protected] http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
