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
# That is actually the correct response. When a conflict occurs in a
# repository no changes are made to the working copy.
Yes changes are made to the working copy
# darcs resolve marks
# up the file that had conflicts with the potential conflicting versions
# like so:
#
# vv
# This is
That is actually the correct response. When a conflict occurs in a
repository no changes are made to the working copy. darcs resolve marks
up the file that had conflicts with the potential conflicting versions
like so:
vv
This is one possibility for the conflict.
--
Hi Eric,
Thanks for your reply -- and volunteering to implement it!
The programs that would seem to work well on windows would be
TortoiseMerge (distributed with tortoiseSVN) and KDiff3, but
perhaps you know of better ones? It should at least be possible
to have the paths to the diff'd files
Jamie:
Thank you very much for the explanation.
How did you learn this?
Could someone update the manual re: darcs resolve and include your
explanation?
Finally, could darcs resolve be renamed to darcs mark-conflicts?
Regards,
Zooko
The behaviour is this:
When darcs applies a
Hello,
Would it be possible to send patches to roundup instead of darcs-
devel so that we have a way to track patches that have been
submitted? I think this is more of a decency to the patch authors
than as a helping hand to maintainers (but I could be wrong). I've
submitted several
On Thu, 2006-01-12 at 23:26 +0100, Eric Kow wrote:
As far as I can see, this is not yet possible. For resolving
conflicts, yes (--external-merge) but not for diffing.
btw, sometime ago I filed a bug to the meld author to add 'output %o'
option to the meld so it can be used as external-merge
