Re: Branch

[Jim Hyslop]

ftrl wrote:
> Hello,
>
> I'm using cvs this way :
> - I'm doing a branch for each important version and every time a new 
> important version is starting, I start a new branch.
>
> Is it a correct way to use the branch system ?
>
> Or the correct way to use is to start branches from the HEAD ?

There really is no "correct" way. Some approaches are better than 
others, when specific results are required.

One important factor that will affect your decision is whether or not 
versions will be intermixed. I.e. will you be working on versions 1.3, 
1.4 and 1.5 at the same time? If so, then you will need to post more 
detailed information about your release strategy.

On the other hand, if version X.Y does not begin until version X.(Y-1) 
is (mostly) complete, then your release and version management strategy 
is much easier: keep all new version development on the trunk. When you 
are ready to begin working on version X.Y, create a branch and move 
development of X.(Y-1) onto that branch.

> In this case, how can I make a branch become the HEAD ? I could merge 
> the branch to the HEAD but I don't want to keep HEAD version.
>
>
>
>                            ----V3----
>                            |
>                 -----V2----|---
>                 |
>        ---V1----|-----
>        |
> HEAD --|-----
>
> How can V3 "replace" head ?

Search the archives for various discussions on this topic (there was one 
within the last two weeks). See the auto-appended link for the archives.

--
Jim