First import Tracking sources Reverting local changes
When a new release of the source arrives, you import it into the
repository with the same
import command that you used to set up
the repository in the first place. The only difference is that you
specify a different release tag this time.
$ tar xfz wdiff-0.05.tar.gz $ cd wdiff-0.05 $ cvs import -m "Import of FSF v. 0.05" fsf/wdiff FSF_DIST WDIFF_0_05
For files that have not been modified locally, the newly created
revision becomes the head revision. If you have made local
import will warn you that you must merge the changes
into the main trunk, and tell you to use `
checkout -j' to do so.
$ cvs checkout -jFSF_DIST:yesterday -jFSF_DIST wdiff
The above command will check out the latest revision of
wdiff', merging the changes made on the vendor branch `
since yesterday into the working copy. If any conflicts arise during
the merge they should be resolved in the normal way (see Conflicts example). Then, the modified files may be committed.
Using a date, as suggested above, assumes that you do not import more than one release of a product per day. If you do, you can always use something like this instead:
$ cvs checkout -jWDIFF_0_04 -jWDIFF_0_05 wdiff
In this case, the two above commands are equivalent.First import Tracking sources Reverting local changes