Hi,
I see an interesting discussion about branching. I've posted a similar
question
(http://lists.gnu.org/archive/html/info-cvs/2005-02/msg00284.html) a
couple of weeks ago, but received no answer. I skimmed through the
mentioned branching guide; it's very useful, but I'm not sure how to
apply that to CVS. So, here's the second try.
On Wed, Mar 02, 2005 at 09:31:25AM -0500, Jim.Hyslop wrote:
> 1.1---1.2---1.3---. . .
> \
> +---1.2.2.1--???
> \
> +---1.2.2.1.2.1--???
> \
> +---1.2.2.1.2.1.2.1--???
Could a Branching Expert please help me drawing the same for my needs?
I've got 4 upstream vendors and want to keep them in different branches.
I have two goals: importing new upstream versions and merging the deltas
into the main trunk, and tracking which change introduced a particular
bug.
I thought it should be like that:
MAIN
1.1.1.1-------------------------------------------------------------------------------1.2
bsp102main---1.3---1.4------------------------1.5 bsp106main
\
/ /
LINUS +---1.2.2.1 2419
/ /
\
/ /
RMK +---1.2.2.1.2.1---1.2.2.1.3 rmk7
/ /
\
/ /
PXA +---1.2.2.1.3.2.1---1.2.2.1.3.3
pxa1-----------------------------1.2.2.1.3.4 pxa3 /
\
/ \ /
HWVENDOR
+---1.2.2.1.3.3.2.1---1.2.2.1.3.3.3 bsp102---1.2.2.1.3.3.4
pxa3bsp102---1.2.2.1.3.3.5 bsp106
But I was not able to import such branches (CVS complained about too
long branch numbers). Ideas?
Two more points:
* Bsp106 is based on pxa3. Should I merge bsp102 with pxa3 before
importing bsp106?
* Should I merge pxa3 with 1.4 before merging 1.4 with bsp106?
I assume both are unnecessary. Would this work?
Thanks in advance,
Baurzhan.
_______________________________________________
Info-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/info-cvs
