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

RE: RE: SVN Merge Tracking Issues

From: <Michael.Rumpf_at_t-systems.com>
Date: Wed, 2 Nov 2011 11:16:30 +0100

Hi,

I have more information on the topic. For me this seems as a bug in the Tortoise SVN "Show log" browser. I did a few more edits (>2) and later renamed the master (previous trunk) to master2. When I cd into the "branch folder" and run the following commands (with the CollabNet SVN 64Bit Windows command line client), I get what I expect:

branch>svn mergeinfo --show-revs eligible "^/master2"
r6
r7
r8
r9
r10

branch>svn mergeinfo --show-revs merged "^/master2"
r3

When I open TortoiseSVN (right click on the branch folder -> Merge) and select the master2 URL, I get a list of all revisions (after unchecking "stop on copy/rename"), including revision number 3, which is already merged, as the output above shows. And the Tortoise SVn client shows revision number 11 which is the rename of the master to master2. This revision is not shown by the command-line client (see attached screenshot).

Regards,
     Michael

>-----Original Message-----
>From: Rumpf, Michael
>Sent: Mittwoch, 2. November 2011 10:22
>To: 'users_at_tortoisesvn.tigris.org'
>Subject: RE: SVN Merge Tracking Issues
>
>Hi,
>
>I created a local repository and did all the modifications exactly as
>described by Stefan Sperling on the subversion mailing list (see initial
>mail).
>Now I'm trying to get TortoiseSVN to show me the revisions that still
>need to be merged.
>
>1. URL to merge from
>I can open the browser, jump from HEAD to revision 4 and select the old
>^/trunk as URL from where to merge.
>
>2. But the next step fails as I do not know which revisions still need
>to be merged. When I click on "Show log" in the "Revision range to
>merge" section of the dialog, instead of a list of revisions to be
>merged, I just see "File not found: revision 6, path '/trunk'.
>
>The same happens when I try to enter the peg revision @4 in the "URL to
>merge from". The "Show log" browser then shows the message: "File not
>found: revision 6, path '/trunk_at_4', but still no list of revisions to be
>merged.
>
>Is this a bug or am I just too stupid to use the merge tracking feature
>with the TortoiseSVN client?
>
>Regards,
> Michael

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2871234

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

svn-mergetrack.png
Received on 2011-11-02 11:17:09 CET

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