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

Re: Merging from renamed branch fails. (TSVN build 7012)

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-07-13 17:47:44 CEST

Lieven Govaerts wrote:
> 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?

Fixed in revision 7018.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jul 13 17:48:00 2006

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