[darcs-users] Pulling and conflict resolution
Edwin Thomson
edwin.thomson at businesswebsoftware.com
Thu Dec 8 14:41:13 UTC 2005
Edwin Thomson wrote:
> Hello
>
> When pulling, I've been routinely using --external-merge, because a
> kdiff3 is a much more pleasant way to resolve conflicts than digging
> through conflict markers. However, darcs creates about four copies of
> my source tree (version1, version2, ancestor, merged) for the pull,
> whether there end up being conflicts or not, which is very slow. Is
> there a way to make it only do this when there are actual conflicts?
It seems that darcs doesn't always do this, and I can't reproduce it on
a simple test repository. I've made a patch that stops it from doing
so, but it's almost certainly a hack applied to the wrong part of the
code, as I don't understand why it happened in the first place.
Edwin
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: pullpatch
Url: http://lists.osuosl.org/pipermail/darcs-users/attachments/20051208/978d67a3/attachment.diff
More information about the darcs-users
mailing list