On Thu, Jun 04, 2009 at 12:10:00 -0500, Kari Hoijarvi wrote: > Since which version have codes like 'M!' been supported? I'm using 2.2.1
I don't think this is particularly new, but there may be some subtleties ahead. > in my test repository: darcs whatsnew -s --look-for-adds > > ./original file.txt -> ./renamed file.txt > A ./added file.txt > M ./conflict file.txt +5 I am not particularly surprised if the darcs whatsnew output never shows a conflict. I believe this is where what users normally thinks of as a conflict doesn't really square with what darcs thinks. If two named patches conflict, in Darcs's simple mind the conflict only exists between those two patches. So if you do a darcs changes, you will see the M! on the latter patch in the conflict. Technically speaking, by the time you get to the working directory, Darcs has already resolved the conflicts for you by backing out both sides of the conflict. It so happens that in addition to resolving the conflict (nullifying both sides), Darcs tries to helpful by dumping some conflict markers into the working directory. This is for your convenience so that (a) you remember that a conflict happened and (b) so that you can more easily recover your changes from both sides of the conflict and (c) so that you can record a whole new patch on top of this resolved state. But the conflict markers are not the same as the conflict itself. As far as Darcs is concerned, the conflict was resolved before the user ever entered the picture. Does that make any sense? -- Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow> PGP Key ID: 08AC04F9
signature.asc
Description: Digital signature
_______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
