www.delorie.com/gnu/docs/cvs/cvs_104.html   search  
Buy the book!

CVS--Concurrent Versions System v1.11.1.1

[ < ] [ > ]   [ << ] [ Up ] [ >> ]         [Top] [Contents] [Index] [ ? ]

13. Tracking third-party sources

If you modify a program to better fit your site, you probably want to include your modifications when the next release of the program arrives. CVS can help you with this task.

In the terminology used in CVS, the supplier of the program is called a vendor. The unmodified distribution from the vendor is checked in on its own branch, the vendor branch. CVS reserves branch 1.1.1 for this use.

When you modify the source and commit it, your revision will end up on the main trunk. When a new release is made by the vendor, you commit it on the vendor branch and copy the modifications onto the main trunk.

Use the import command to create and update the vendor branch. When you import a new file, the vendor branch is made the `head' revision, so anyone that checks out a copy of the file gets that revision. When a local modification is committed it is placed on the main trunk, and made the `head' revision.

13.1 Importing for the first time  
13.2 Updating with the import command  
13.3 Reverting to the latest vendor release  
13.4 How to handle binary files with cvs import  Binary files require special handling
13.5 How to handle keyword substitution with cvs import  Keyword substitution might be undesirable
13.6 Multiple vendor branches  What if you get sources from several places?

  webmaster     delorie software   privacy  
  Copyright 2003   by The Free Software Foundation     Updated Jun 2003