You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Cory Riddell <co...@codeware.com> on 2010/07/06 18:06:37 UTC

swapping the trunk and a branch

We are about to upgrade to a new Visual Studio. While preparing for the
upgrade, I created a branch call VS2010 to test our software and make
sure everything is working before moving everybody to the new IDE.

Things have checked out and now we want to upgrade. I want to swap my
trunk and my branch. I think it should be as easy as moving my trunk to
a branch, then moving my VS2010 branch to the trunk. Does this sound
right? If between now and our release we find some VS2010 show stopper,
I should be able to just merge all the changes from our VS2010 trunk
into the branch, then build the branch with our old build tools.

Please let me know if there is a major flaw in my understanding of SVN.

Thanks,
cory

Re: swapping the trunk and a branch

Posted by Ulrich Eckhardt <ec...@satorlaser.com>.
On Tuesday 06 July 2010, Cory Riddell wrote:
> We are about to upgrade to a new Visual Studio. While preparing for the
> upgrade, I created a branch call VS2010 to test our software and make
> sure everything is working before moving everybody to the new IDE.

Completely normal approach, separate big changes into a branch.


> Things have checked out and now we want to upgrade. I want to swap my
> trunk and my branch.

This sounds strange now. Normally, you would merge the branch back into the 
trunk. Also, what about the changes made to the trunk since you made the 
branch? Do you want to discard them?

> I think it should be as easy as moving my trunk to a branch, then moving
> my VS2010 branch to the trunk. Does this sound right?

It makes for a very strange history line, but there is no technical reason it 
shouldn't work.

> If between now and our release we find some VS2010 show stopper, 
> I should be able to just merge all the changes from our VS2010 trunk
> into the branch, then build the branch with our old build tools.

Even if you later find the need to discard the VS2010 integration, you can 
still create a branch from the version before you merged it. You don't have 
to create it now.

Uli

-- 
ML: http://subversion.tigris.org/mailing-list-guidelines.html
FAQ: http://subversion.tigris.org/faq.html
Docs: http://svnbook.red-bean.com/

Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932

**************************************************************************************
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
           Visit our website at <http://www.satorlaser.de/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************