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

Merging from renamed branch fails. (TSVN build 7012)

From: Lieven Govaerts <lgo_at_mobsol.be>
Date: 2006-07-13 14:39:01 CEST

Hi,

I posted this issue already some time ago but didn't get an answer, so let's
retry.

I'm using TortoiseSVN 1.4 nightly build 7012. I see an issue where merging
revisions from a branch that was renamed (after those revisions) fails.

1. Create trunk
2. Create branch 1.x from trunk
3. Make some changes in 1.x, say in r3-6
4. Rename branch 1.x to 1.x-tobemerged.
5. Use TSVN merge to merge r3-6 from 1.x-tobemerged to trunk.

Strangely enough, I can get two errors:
- working copy c:\...\trunk is locked, please cleanup.
- branch 1.x-tobemerged doesn't exist.

I guess an incorrect usage of peg-revisions?

regards,

Lieven.

----------------------------------------------------------------
This message was sent using IMP, the Internet Messaging Program.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jul 13 14:39:15 2006

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