Clive Crous wrote:
That happens all by itself, without needing to call darcs resolve.
For every conflict I've seen thus far (on pulls, even) I've had to call
darcs resolve to get the conflict marked and the working copy changed.
I went to the manual to double check what the default behavior is and
noticed that is a bit conflicted about it...
From http://www.darcs.net/manual/node6.html#SECTION00635000000000000000:
"Darcs escapes this problem by ignoring those parts5.7of the patches
that conflict. They are ignored in both patches. If patch A changes the
line ``FIXME'' to ``FIXED'', and patch B changes the same line to
``DONE'', the two patches together will produce the line ``FIXME''.
Darcs doesn't care which one you pulled into the repository first, you
still get the same result when the conflicting patches meet. All other
changes made by A and B are performed as normal."
That is the behavior I've noticed. Later in the section, however, it says:
"When you pull patches, darcs automatically performs a resolve for you
if a conflict happens."
That is the behavior you've noticed.
Anyone know the reason for this conflict in the manual/experience?
--
--Max Battcher--
http://www.worldmaker.net/
"History bleeds for tomorrow / for us to realize and never more follow
blind" --Machinae Supremacy, Deus Ex Machinae, Title Track
_______________________________________________
darcs-users mailing list
[email protected]
http://www.abridgegame.org/mailman/listinfo/darcs-users
