[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Conflict handling on merge-range application

From: Daniel Berlin <dberlin_at_dberlin.org>
Date: 2006-07-12 09:54:05 CEST

So i'm not sure your current idea of stopping as soon as a single
conflict happens during a merge-range application is a good idea:

1. It's not what we do now in the same situation (effectively all of our
non-single rev merges are merge-range applications, the range is contiguous)
2. Finishing a large merge would take a very large number of calls to
svn merge if you have a lot of conflicts, because you are stopping the
merge each time, even if the conflicts are not in the same files.
3. You end up with more work, particularly in the case where the same
lines get changed *again* in a later revision (now you get two conflicts
instead of 1).

I expect merge to do what i tell it to, and to let me deal with the
problems that happened as a result. I don't know of *any* VCS tool that
will stop merge application at a conflict because it thinks it is
"better for me" in some way :).

At a bare minimum, I would think the user experience would be severely
affected by a change to stop merge application, unless you would only
stop merge application if we have a conflict on the same lines of the
same file between multiple merge ranges.

Even then, i'm still not so hot on the idea, but AFAIK we don't have a
good way to replace merge markers with a newer set of merge markers to
handle these cases. :)

--Dan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 12 09:55:07 2006

This is an archived mail posted to the Subversion Dev mailing list.