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

TSVN merge report inconsistent to svn merge

From: John Williams <xrayz_at_bigfoot.com>
Date: Thu, 10 Jul 2008 02:09:28 +0100

Hi,

When I perform a tracked merge using the wizard in TSVN the "Merge -
TortoiseSVN Finished!" dialog box displays some results. The merge range
displayed in that box is inconsistent with the command line client when
performing the exact same merge.

TSVN merge with empty range box, the output is:

Command Merging revisions 1-HEAD of file:///D:/svn/test15/branches/1.x
into D:\docs-john\Dev\test15-trunk, respecting ancestry
Merging r4 through r6 D:\docs-john\Dev\test15-trunk
...snip

If I revert the merge then perform the same merge with the command line
I see the following:

\docs-john\Dev\test15-trunk>svn merge file:///D:/svn/test15/branches/1.x
--- Merging r5 through r6 into '.':
...snip

The difference here is that TSVN says "r4 through r6", while SVN says
"r5 through r6". I appreciate that r6 is a changeset of r5:6. I'm not
questioning the merge, just the report is inconsistent and possibly
misleading.

TortoiseSVN 1.5.0, Build 13316 - 32 Bit , 2008/06/21 07:55:29
svn version 1.5.0 (r31699)

--
John
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-10 07:01:42 CEST

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