So, you want branches?
Document Actions
Submitted by
reedstrm.
on 2005-08-15 17:26.
A brief "how to make branches in CVS"
The CVS Branching Foxtrot:
Starting with a CVS checkout, which contains (or will contain) changes you wish to put on a branch -
Move
up the checkout tree to the highest directory that contains all of the
code
you wish to be on the same branch (and share the same tag). Now, pick a
tagand branch name to describe your changes, and apply the following
CVS commands. For
example, I have code in RisaRepository and RisaModuleStorage that
should
be tagged together, so I cd to software/zope, and decided the right tag
name is "search-match-allterms". Now, I do these steps:
0. cvs update RisaRepository RisaModuleStorage
- resolve any conflicts
- I find them with this:
cvs status -v 2>/dev/null | grep ^File | grep -v Up-to-date
- cvs tag search-match-allterms-base RisaRepository RisaModuleStorage
- This creates a tag for the branch point, so you can easily diff between the tip of the branch you're creating and the state of the code before you branched. The tag name is "search-match-allterms-base". Our general policy is to create this tage as <foo>-base, indicating it marks the base of a branch.
- After the tag name, include all the
affected folders you need to tag. If that's a single folder and you're
inside it, you can omit the folder names entirely.
- cvs tag -b search-match-allterms-branch RisaRepository RisaModuleStorage
- the -b option to cvs creates a branch.
- Note how the branch name matches the tag name above, with -branch substituted for -base.
- cvs update -r search-match-allterms-branch RisaRepository RisaModuleStorage
- Make sure you use the -branch tag, not the -base tag!
- should be no conflicts (you fixed them before step 1, remember?)
- you are now on the branch in these directories ('cvs status -v filename' shows a sticky tag)
- cvs commit RisaRepository RisaModuleStorage
- You can now do a simple commit, since the update above put your tree onto the branch.
If
all your changes are in one folder, the above commands can be
simplified by changing into that folder, and omitting the target names.
Re: So, you want branches?
