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

[TSVN] Merging from deleted branch to trunk

From: Roel Harbers <roel_at_roelharbers.nl>
Date: 2005-01-19 15:31:25 CET

Hi,

I want to merge changes from a branch that doesn't exist anymore to my
trunk wc. So, I use the branch url as From, set the 'From Revision' to
the start of the branch (1350), check 'Use "From:" URL', and set 'To
Revision' to the last revision where the branch still existed (1359).

I now get a 'path svn://server/repo/branches/v1.1RC doesn't exist in
revision 1397' (1397 being HEAD)

I suspect tsvn does the equivalent of:
"svn merge -r1350:1359 svn://server/repo/branches/v1.1RC"
while it should do
"svn merge -r1350:1359 svn://server/repo/branches/v1.1RC_at_1350"
or
"svn merge svn://server/repo/branches/v1.1RC_at_1350
svn://server/repo/branches/v1.1RC_at_1359"
(both of which succeed from the command line)

I tried it with 'Use "From:" URL' unchecked too (and the To url set to
the same branch url), but that failed too, with the same error.

TSVN v1.1.2 Build 2482 UNICODE (that's the 1.1.3 release candidate, right?)

Regards,

Roel Harbers

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jan 19 15:33:59 2005

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