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

Re: Tortoise gets confused when branches are renamed

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 08 May 2009 19:18:05 +0200

Nikki Locke wrote:
> Just in case it helps, I have just gone through the process of
> reproducing it in a spare repo here. The repo is running svn service,
> so I can analyse the packets going between client and server.
>
> This is what I did:

I can reproduce the issue just fine, and it works as expected.
Have a look at the attached image (part of the revision graph of my test
repo).

As you can see, I've created /branches/1.0.2 from trunk in r75.
I then made some changes to two files in branches/1.0.2.
In r79, I renamed/moved branches/1.0.2 to branches/1.0.2-may8-2009.
Did one commit on trunk
Then created branches/1.0.2 from trunk in r81.

If I now show the log for branches/1.0.2 from HEAD, the files I modified
in r77-r78 are not shown, because these are not the same files! Follow
the revision graph from node 81 back to trunk - the changes were made on
a different branch (but which had the same name earlier).

Now, if I show the log for the branches/1.0.2-may8-2009 branch, I can
see the changes I made in r77/r78. But when I try to show a diff for
those files, the diff is done with HEAD as the peg revision (I'll change
that soon, stay tuned for a fix).
But when comparing the revisions 77/78 of url branches/1.0.2/file with
HEAD peg, the diff is done unfortunately on the branches/1.0.2 part that
exists in HEAD - which is a different branch.

If the branches/1.0.2 didn't exist in HEAD, the diff would work because
then the HEAD peg diff would fail, and TSVN would try again with two
other peg revisions before giving up.

I hope this explains the problem.

To work around this:
* open the repository browser
* go to branches/1.0.2-may8-2009
* click on the rev button "HEAD", enter r79
* let the repobrowser refresh
* right-click on branches/1.0.2-may8-2009
* show log
now the log dialog doesn't have HEAD as the first revision anymore, and
therefore won't pass HEAD as the peg revision for diffs anymore.

Another way:
* open the revision graph
* click on the last visible branches/1.0.2-may8-2009 node, "show log".

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2116571
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

test.png
Received on 2009-05-08 19:18:39 CEST

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