[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Merge question
From: |
Mike Chartier |
Subject: |
Merge question |
Date: |
Mon, 8 Jan 2001 10:43:29 -0500 |
Hi,
I have a codebase I would like to manage using CVS. At certain points in time
I want to create a "stable release" version.
I would like to keep each "stable release" in it's own branch. Bug fixes to
releases go out as updates.
Graphically, this is how things look (in my mind):
Module
|
|
|
+ - Tagged "Software_1.0"
|\
| \
| \
| \
| |
| | - Tagged "Software_1.0_Update_1"
| |
+ - Tagged "Software_1.1"
|\ |
| \ | - Tagged "Software_1.0_Update_2"
| | |
| | - Tagged "Software_1.1_Update_1"
| | |
Typically bugs are found and their fix needs to be propegated to one or more
of the "stable releases" (i.e. branches). Can CVS do this easily and if so,
how. I have tried several things, none of which worked.
-Mike
- Merge question,
Mike Chartier <=