|
From: | Shyam L |
Subject: | Merging from a branch many times |
Date: | Tue, 21 Aug 2001 14:28:40 -0700 |
Hi all,
We are using CVS in our company for source code
management. We have an interesting problem which I am trying to
address.
We are having different versions of the product for
which the development happens simultaneously. For example, at this point, we
are in the process of releasing version 1.0 of the product, but have
already started on working on 1.1 & 1.2 releases as well. At
different points in time, we will have to do code changes to 1.1, which we want
to merge into 1.0 & 1.2 as well and vice-versa. Since CVS has problems
when it comes to merging across branches and multiple merges from the same
branch to another, can anybody suggest a work-around for this? This is assuming
that we will maintain different branches for 1.0, 1.1 & 1.2.
Thanks in advance,
Shyam
|
[Prev in Thread] | Current Thread | [Next in Thread] |