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

AW: Re: Making a branch the new trunk

From: Felix Gilcher <gilcher_at_exozet.com>
Date: 2006-06-13 13:52:31 CEST

Peter Werner <mailto:l.svn@vasas.no-ip.org> schrieb am Dienstag, 13. Juni 2006 11:13:

>> What is the best practice to abandon the current trunk and make some
>> branch the new trunk? Say I have created a branch by calling
>>
>> svn copy trunk branch/foo
>>
>> and then make changes on the branch and on the trunk. After a while I
>> decide that I won't further develop the trunk version and that
>> branch/foo should be the new trunk. I would do it this way:
>>
>> svn rm trunk; svn move branch/foo trunk
>>
>> Is this the correct and best way to do it? Or are there any
>> drawbacks or better ways?
>
> I think that is the right way, because history of changes will not be
> lost.
>
> Br, Péter
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org

There is another problem in here that we've run into: If you delete the trunk directory and then copy the branch directory there, every "svn up" command will try to do the same (first delete, then add). So if you have a checkout of the trunk before the delete/copy operation and then try an svn up afterwards you'll get the famous "Cannot replace directory from within" message - at least that's what we've got. So we always do the merge.

regards

fg

-- 
Felix Gilcher
Head of IT Development
Exozet Berlin GmbH
Rotherstraße 20
10245 Berlin
eMail: gilcher@exozet.com
URL: www.exozet.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jun 13 13:54:05 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.