Hi all,
This may be a newbie merge question, but I can't find anything in the
faqs or the docs that I've found on the web that can help me with this.
A few months ago, I branched a development version of our code off (call
this branch A). We have continued development on both the main trunk
and on branch A. At this point, the code that's sitting on branch A
should become the "primary version" of the code, i.e., the code that
gets checked out if someone says "cvs co module" with no revision tag.
This means it needs to become the version of the code sitting on the
trunk. The code that's at the current head revision of the trunk should
become a new branch (branch B) on which a separate thread of development
can continue. From this point on we will have two versions of the code,
one for our in-house development group, and one for our consulting
group. The consulting group's code is what's going to be on branch B.
Occasionally changes will travel back and forth between the branches,
but for the most part they will be separate code bases.
If I look back at the history of files on the main trunk after I merge
branch A with the trunk, I'd like to see all of the revisions that
occurred on the branch, and not those that occurred in the main trunk
between branch A and branch B. Similary, I'd like the revisions that
occurred on the main trunk between branch A and branch B to continue
with branch B.
Is there a way to essentially "rotate" the trunk 90 degrees around a
branchpoint, so that what's currently the trunk becomes a new branch and
what's currently a branch becomes the new trunk? I suppose that one way
to do this is:
1) Create a new branch B at the same point as branch A. Populate all
changes on the main trunk to the new branch (I don't know if there's a
way to do this with merge or not).
2) Populate all changes from branch A to the main trunk. Again, it
would be nice if there's a way to do this with merge and maintain
history.
I'll play with cvs in a test repository some more to see if I can figure
this out, but any help would be greatly appreciated.
Thanks,
Matt
--
Matt Hartfield
Kivera, Inc.
[EMAIL PROTECTED]
