info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

how to use branchs


From: Jean-Baptiste Bavoux
Subject: how to use branchs
Date: Thu, 16 Mar 2006 17:32:58 +0100
User-agent: Thunderbird 1.5 (Windows/20051201)

There is a projet, consisting in 3 files: fileA , fileB and fileC
This project will have two releases: release1 and then release2


When arrives release1 my cvs looks like this:

fileA & file B & fileC
1.1
 |
1.2 <- TAG release1

then I start modifing fileA for the next release

fileA
1.1
 |
1.2 <- TAG release1
 |
1.3

Question: Should I create a Branch for release2 ? I don't think.

Then i got a bug on release1 on fileA.
I 'am obliged to create a branch

fileA
1.1
 |
1.2 <- TAG release1, BRANCH release1
 |                             |
1.3                           1.2.1 <- TAG release1.1
 |                             |
1.4 <---------Merge------------|
I'll merge 1.2.1 into HEAD to correct my bug for release2.

Question: Should i create the branch for fileB and fileC ?

then i got a bug on release1 on fileB.
this file has not been modified for Release2 and the correction on release1 must be applies on release2.

Question: Should i create the branch for fileB?

fileB
1.1
 |
1.2 <- TAG release1, BRANCH release1
 |                            |
 |                         1.2.1 <- TAG release1.1
1.3 <---------Merge-----------|
and then merge 1.2.1 in HEAD
Or should I continue in the HEAD?
fileB
1.1
 |
1.2 <- TAG release1
 |
1.3 <- TAG release1.1



Where can I find documentation about how/when/why to use branches ?



reply via email to

[Prev in Thread] Current Thread [Next in Thread]