On Mon, Oct 31, 2011 at 05:21:12PM +0100, michael.ru...@t-systems.com wrote: > >Does this match the situation you were facing? > This seems to be exactly the issue we are facing.
Great! So it should "just work" if the tool is driven in the right way. > The developers are > using TortoiseSVN and not the command-line, so I need to map the > commands to the UI client: > > 1. Open the Merge Editor > 2. Open the browser window "URL to merge from: -> ..." > You need to enter a URL, otherwise the "..." will not open any window. > If you enter the old ^/trunk it switches back to the current root, as the > window opens with "HEAD" revision. > 3. Go back to the revision before the rename/move operation happened: 4 in > your example above (69398 in my case) > 4. Select the Branch URL for the old location from which you want to merge > 5. Click OK > 6. Click on Show Log for the "Revisions range to merge" > No eligible revisions are shown in the list, instead it says > '/svn/REPO/!svn/bc/5/trunk' path not found (69402 in my case) > I think you should ask on the tortoisesvn users mailing list about this (see http://tortoisesvn.net/community.html). It is possible that this is a problem in the way TortoiseSVN queries the SVN API. Maybe it passes a wrong peg-revision, without allowing the user to specify a different one? I'm not familiar with TortoiseSVN internals so I'm afraid I cannot help further.
