CVS---Concurrent Versions System. Node: Branching and merging

PREVRevisions UPTop NEXTRecursive behavior

Chapter 5: Branching and merging

CVS allows you to isolate changes onto a separate line of development, known as a branch. When you change files on a branch, those changes do not appear on the main trunk or other branches.

Later you can move changes from one branch to another branch (or the main trunk) by merging. Merging involves first running cvs update -j, to merge the changes into the working directory. You can then commit that revision, and thus effectively copy the changes onto another branch.

  • Branches motivation What branches are good for
  • Creating a branch Creating a branch
  • Accessing branches Checking out and updating branches
  • Branches and revisions Branches are reflected in revision numbers
  • Magic branch numbers Magic branch numbers
  • Merging a branch Merging an entire branch
  • Merging more than once Merging from a branch several times
  • Merging two revisions Merging differences between two revisions
  • Merging adds and removals What if files are added or removed?
    • PREVRevisions UPTop NEXTRecursive behavior