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

Multiple conflicts while postponing conflict resolution across multiple merged commits

From: Rick Ramstetter <rick.ramstetter_at_gmail.com>
Date: Tue, 21 Feb 2012 16:48:12 -0800

Hi all,

A question regarding the handling of multiple conflicts while
postponing conflict resolution across multiple merged commits.

Let's say I merge two commits from trunk to a branch:
$ cd /pathto/branch
$ svn merge svn://repo/trunk -c 1,2 --accept=postpone

Each of those merged commits (c1 and c2) causes a content (aka "Text")
conflict in some file, "SomeFile."
At this point, I believe SVN has merged c1, discovered a conflict,
postponed that conflict, and continued to merge c2 onto the conflicted
SomeFile.

If I run:
$ svn resolve --accept=theirs-conflict ./pathto/SomeFile

... Then I'm left in a situation where SVN has marked the conflicts as
resolved ("svn status" reports no conflicts).
Unfortunately, after running the above "svn resolve" a conflict does
still exist. Opening up SomeFile in an editor, conflict markers are
plainly seen.
I believe this is because SVN has only resolved one of the two conflicts.

Another SVN user bumped into this situation here:
http://subversion.tigris.org/ds/viewMessage.do?dsMessageId=98194&dsForumId=1065
(subject: "multi-part merge with conflicts does not bail out with an
error message")

Is any related development in progress or in planning? More
specifically, will "svn resolve" ever be able to resolve multiple
overlaid conflicts?
Does any way currently exist to achieve this functionality (besides
serially merging commits)?

In my example above, I'm using SVN 1.6.12.

Thanks in advance for all responses,
--Rick R.

--
J. Rick Ramstetter
http://paul.rutgers.edu/~jramstet
My @cs.rutgers.edu email address is forwarded to my @gmail.com address.
Received on 2012-02-22 01:48:44 CET

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