We are ...
Branching Cheat Sheet
Branching Cheat SheetThis is a pretty basic cheat sheet on how to create branches using CVS, which is what is used in the Latex-Suite project to maintain the code and collaborate between the developers. (I have developed a bad habit of saying "Developers! Developers! Developers!" whenever I want to say developers, wonder why?) This document is compiled from the following sources:
NOTE: Not all these steps are mandatory. They are just a good thing to do.
Branching in CVS is used when some major change is being planned which might destabilize the code. Branching enables you to work on a copy of the files till the code on that "branch" has been suitably stabilized, and then "merge" the changes in the branch back into the main trunk.
Branching essentially consists of four stages. In the first stage, you create the branch itself, i.e, you "tag" the files in some stage as the "root" of the "branch". You then "checkout" a copy of the files in the branch and work on that. After you are confident that you want the changes to be "merged" into the main trunk, you prepare both the branch and the trunk and then finally do the merging itself. These things have been explained in great detail here.
Creating a branch
Checking out a branch
$ cvs co -r b-<branchname> -d /path/to/branch <modulename>The -d /path/to/branch argument specifies where the files in <modulename> will be checked out to on the local machine. It can be relative to the local directory, in which case use path/to/branch instead of /path/to/branch.
Preparing a branch for merging into trunk
The final Merging Step
|©Vim-latexSuite Team 2002|