Merging File Revisions

See Also

You can merge your working your working copy of a file or directory with an earlier revision, with a revision on a different branch, or with the difference between two earlier revisions. The CVS command-line equivalent to the Merge command is cvs update -j.

To perform a merge from the Filesystem window:

  1. Right-click the file's node in the Filesystem window, hold down the Control key, and choose CVS and choose Update. If your CVS filesystem is set to use advanced command options, you do not have to hold down the Control key.
  2. In the Update dialog box, enter the revision number or tag for the revisions you want to merge into your working copy.

To perform a merge from the Versioning window:

  1. Right-click the file in the Filesystem window and choose Show Versions.
  2. In the Versioning window, expand the file's node to reveal the subnodes for each revision and branch.
  3. Right-click the revision you want to merge into your working copy and choose Merge With Revision.

    To merge the difference between two revisions into your working copy, hold down the Control key and select the two revisions. Then right-click one of the revisions and choose Merge With Rev. Differences.

For more information about merging files with CVS, consult your CVS documentation. CVS documentation is available from:

http://www.cvshome.org/docs/manual
See Also
Resolving Merge Conflicts
Creating and Applying a Patch
Comparing File Revisions Visually
Versioning Window

Legal Notices