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

what happens when a "multi-part" merge has a conflict?

From: Robert P. J. Day <rpjday_at_crashcourse.ca>
Date: Tue, 16 Sep 2008 13:51:25 -0400

   from the section "Advanced Merging," side note regarding doing a
merge which has to jump over a single earlier, cherrypicked revision:

"Did you notice how, in the last example, the merge invocation caused
two distinct ranges of merges to be applied? The svn merge command
applied two independent patches to your working copy to skip over
changeset 355, which your branch already contained. There's nothing
inherently wrong with this, except that it has the potential to make
conflict resolution trickier. If the first range of changes creates
conflicts, you must resolve them interactively for the merge process
to continue and apply the second range of changes. If you postpone a
conflict from the first wave of changes, the whole merge command will
bail out with an error message."

   fair enough, but that doesn't explain what happens if the *first*
patch succeeds and the *second* one runs into a conflict. or am i
just reading that too pedantically?


To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-16 19:51:48 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.