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

RE: SVN Merge Tracking Issues

From: <Michael.Rumpf_at_t-systems.com>
Date: Wed, 2 Nov 2011 10:21:55 +0100

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=2871216

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-11-02 10:36:57 CET

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