You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Boelter Markus <Ma...@Micronas.com> on 2004/10/25 11:46:55 UTC
Branching
Hello!
I've got a few questions about methodically using of branches: At the moment I am maintaining a project which has a development-tree called trunk. The mainpart is a directory containing a huge amount of scripts.
Because these script should run on different platforms - and for that need some specific changes per platform - I built four branches: One branch for each platform.
If I add or delete a file in my trunk, this file would NOT appear/disappear in all my branches. Do I have to copy/delete it manually, i.e. svn cp http://svn/project/trunk/script3 http://svn/project/branch1/script3?
My second issue is a future branch which would be very close to one of my existing branches (and more far away from the trunk). Does it make sense to make a branch of a branch? Or better use the trunk as the source and do much changes to the future branch? I guess a branch from a branch would make more sense - but I don't want to run into trouble if this is the wrong way...
Thanks for help!
Markus
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Branching
Posted by Jeroen Leenarts <le...@tiscali.nl>.
Boelter Markus wrote:
> If I add or delete a file in my trunk, this file would NOT
> appear/disappear in all my branches. Do I have to copy/delete it
> manually, i.e. svn cp http://svn/project/trunk/script3
> http://svn/project/branch1/script3?
>
>
In my opinion, this behaviour is exactly the reason to do a branch. Yes,
you have to do the manual copy/delete on the extra branches. This is
because the branch is a copy, which means that from then on for SVN it
is a seperate entity with its own version history.
> My second issue is a future branch which would be very close to one of
> my existing branches (and more far away from the trunk). Does it make
> sense to make a branch of a branch? Or better use the trunk as the
> source and do much changes to the future branch? I guess a branch from
> a branch would make more sense - but I don't want to run into trouble
> if this is the wrong way...
>
>
Branching a branch is never a problem. Perhaps this link (
http://svnbook.red-bean.com/svnbook-1.1/ch04.html ) might prove usefull
to get some insight on what's best to do. As allways, branching and
merging are activities that should be done with proper preperation and
planning.
Jeroen
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org