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

Re: Merging multiple revision may lead to unnecessary conflicts

From: Mark Phippard <markphip_at_gmail.com>
Date: Fri, 7 Mar 2008 12:41:22 -0500

On Fri, Mar 7, 2008 at 12:11 PM, Tobias Schäfer <tobiasschaefer_at_gmx.de> wrote:
> using the nightly of TSVN which uses alpha2 of subversion I found the
> following merge scenario which results in an unnecessary conflict. It
> basically happens when multiple revisions are merged in the wrong order
> despite them relying on one another.
> Note: This is not the scenario which Stefan mentioned minutes ago in the
> thread "Ready for RC1"
> To reproduce the merge which results in unncessary conflicts do the
> following with TortoiseSVN:
> Call "Merge..." on the 1.4.x branch, choose "Merge a range of revisions" and
> select the revisions 7508 and 7994 using the log dialog. Note: The merge
> dialog will show the revisions in the order "7994,7508". Now start the
> merge. This will result in a conflict in www\Changelog.txt - please ignore
> the other conflicts.
> To reproduce with the command line client (only look at www\ChangeLog.txt
> and ignore the other files!)

This is exactly the same thing Stefan asked. Or at least as I
interpreted it. SVN will merge the revisions in the order you give
them. TSVN needs to change to put your selections in the right order.
 Since it allows you to type in the field, I would suggest that TSVN
pass the revisions as they are typed, but change the revision selector
to order them properly. So if for some reason, someone wants this in
a particular order they can still do it.

Mark Phippard
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-03-07 18:41:36 CET

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