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

RE: Re: Tortoise gets confused when branches are renamed

From: Nikki Locke <nikki_at_trumphurst.com>
Date: Fri, 8 May 2009 09:52:12 -0700 (PDT)

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:

Go into repo-browser, navigate to trunk, copy trunk to /branches/test (rev 659).

Checkout /branches/test, modify a file, check it back in (rev 660).

Go into repo-browser, navigate to /branches/test, rename to /branches/test.renamed (rev 661).

Navigate to trunk, copy trunk to /branches/test (rev 662).

Navigate to /branches/test.renamed, right click, choose log.

I now see the following revisions (and some more):

Revision: 661
Author: nikki
Date: 16:39:32, 08 May 2009
Message:
Renamed test branch

----
Deleted : /branches/test
Added : /branches/test.renamed (Copy from path: /branches/test, Revision, 660)
Revision: 660
Author: nikki
Date: 16:39:03, 08 May 2009
Message:
Added some notes in the test branch
----
Modified : /branches/test/notes.txt
Revision: 659
Author: nikki
Date: 16:37:41, 08 May 2009
Message:
Start test branch
----
Added : /branches/test (Copy from path: /trunk, Revision, 658)
Click on rev 660.
Rurn on packet logging between client and server.
Right click on notes.txt in the bottom window and choose Unified diff.
SVN sends the following diff command to my svn server:
( diff ( ( 660 ) 9:notes.txt true false 37:svn://router/SpecSoft/trunk/notes.txt true infinity ) ) 
Can't figure out why it is asking for trunk diffs!
Here is a more complete list of the conversation between client and server:
client->server
( 2 ( edit-pipeline svndiff1 absent-entries depth mergeinfo log-revprops ) 43:svn://router/SpecSoft/branches/test.renamed 21:SVN/1.6.2 (dev build) ( 24:TortoiseSVN-1.6.99.16286 ) ) 
server->client
( success ( ( CRAM-MD5 ) 18:moorsbroadband.net ) ) 
client->server
( CRAM-MD5 ( ) ) 
server->client
( step ( 65:<17600577042482026555.1241798655202860_at_router.moorsbroadband.net> ) ) 
client->server
38:nikki 8d266d2b2e1dfaccb37695f39bf0fdf0 
server->client
( success ( ) ) ( success ( 36:07c935a1-ad1f-0410-89d7-ec778b4ee0b7 21:svn://router/SpecSoft ( mergeinfo ) ) ) 
server->client
( success ( 2 2 ( ) ( edit-pipeline svndiff1 absent-entries commit-revprops depth log-revprops partial-replay ) ) ) 
client->server
( 2 ( edit-pipeline svndiff1 absent-entries depth mergeinfo log-revprops ) 45:svn://router/SpecSoft/branches/test/notes.txt 21:SVN/1.6.2 (dev build) ( 24:TortoiseSVN-1.6.99.16286 ) ) 
server->client
( success ( ( CRAM-MD5 ) 18:moorsbroadband.net ) ) 
client->server
( CRAM-MD5 ( ) ) 
server->client
( step ( 64:<8796485423159336049.1241798655416045_at_router.moorsbroadband.net> ) ) 
client->server
38:nikki 3b56d7eac9a1344f55a32a03522431c6 
server->client
( success ( ) ) ( success ( 36:07c935a1-ad1f-0410-89d7-ec778b4ee0b7 21:svn://router/SpecSoft ( mergeinfo ) ) ) 
client->server
( get-latest-rev ( ) ) 
server->client
( success ( ( ) 0: ) ) ( success ( 663 ) ) 
client->server
( get-locations ( 0: 663 ( 659 660 ) ) ) 
server->client
( success ( ( ) 0: ) ) ( 659 16:/trunk/notes.txt ) ( 660 16:/trunk/notes.txt ) done ( success ( ) ) 
client->server
( reparent ( 37:svn://router/SpecSoft/trunk/notes.txt ) ) 
server->client
( success ( ( ) 0: ) ) ( success ( ) ) 
client->server
( check-path ( 0: ( 660 ) ) ) 
server->client
( success ( ( ) 0: ) ) ( success ( file ) ) 
client->server
( reparent ( 37:svn://router/SpecSoft/trunk/notes.txt ) ) 
server->client
( success ( ( ) 0: ) ) ( success ( ) ) 
client->server
( check-path ( 0: ( 659 ) ) ) 
server->client
( success ( ( ) 0: ) ) ( success ( file ) ) 
client->server
( reparent ( 27:svn://router/SpecSoft/trunk ) ) 
server->client
( success ( ( ) 0: ) ) ( success ( ) ) 
server->client
( success ( 2 2 ( ) ( edit-pipeline svndiff1 absent-entries commit-revprops depth log-revprops partial-replay ) ) ) 
client->server
( 2 ( edit-pipeline svndiff1 absent-entries depth mergeinfo log-revprops ) 27:svn://router/SpecSoft/trunk 21:SVN/1.6.2 (dev build) ( 24:TortoiseSVN-1.6.99.16286 ) ) 
server->client
( success ( ( CRAM-MD5 ) 18:moorsbroadband.net ) ) 
client->server
( CRAM-MD5 ( ) ) 
server->client
( step ( 65:<13295249342079689620.1241798655457189_at_router.moorsbroadband.net> ) ) 
client->server
38:nikki a04113e42f52f6498a09b0b36e6452a3 
server->client
( success ( ) ) ( success ( 36:07c935a1-ad1f-0410-89d7-ec778b4ee0b7 21:svn://router/SpecSoft ( mergeinfo ) ) ) 
client->server
( diff ( ( 660 ) 9:notes.txt true false 37:svn://router/SpecSoft/trunk/notes.txt true infinity ) ) 
server->client
( success ( ( ) 0: ) ) 
client->server
( set-path ( 0: 659 false ( ) infinity ) ) ( finish-report ( ) ) 
server->client
( success ( ( ) 0: ) ) ( target-rev ( 660 ) ) ( open-root ( ( 659 ) 2:d0 ) ) ( close-dir ( 2:d0 ) ) ( close-edit ( ) ) 
client->server
( get-dir ( 0: ( 659 ) true false ( ) ) ) 
server->client
( success ( ( ) 0: ) ) ( success ( 659 ( ( 21:svn:entry:last-author 5:nikki ) ( 14:svn:entry:uuid 36:07c935a1-ad1f-0410-89d7-ec778b4ee0b7 ) ( 23:svn:entry:committed-rev 3:636 ) ( 24:svn:entry:committed-date 27:2007-09-05T15:55:27.647190Z ) ) ( ) ) ) 
client->server
( success ( ) ) 
server->client
( success ( ) )
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2116124
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-05-08 19:03:31 CEST

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