From: Kal A. <ka...@te...> - 2002-02-25 09:05:31
|
At 10:44 25/02/2002 +0100, Norbert Hartl wrote: >Hi, > >>I will freely admit that I have very little experience in developing with >>CVS branches - any hints and tips from pros on the list would be >>gratefully received! >On which checkpoint did you create the branch? On a date checkpoint? >Usually you would tag a current state for possible branch action. >If you have a tag you can branch whenever you like to based on the >tag. It is also a lot easier to check things changed when working >with tags. At least I started off in the right direction then! The branch was created from the R_0_6_0 tag >Joining the branch in the HEAD trunk needs just a little discipline. >While it isn't necessary to freeze the tree while joining in the HEAD >trunk I would recommmend to do so. It keeps the level of cvs command >complexity low. > >A good style would always be: > >- tag the tree for a branch candidate >- if it is necessary branch at that tag >- everybody works on his branch of intereset >- prevent others to commit changes while > you are joining the branch >- tag the tree at the point you joined the branch >- decide if you need the branch any longer >- if not make sure everybody switched his local copy > from branch to the HEAD tree > >I hope this is of any help, A lot of help, thanks Norbert. Cheers, Kal |