Merging File Revisions

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

The Merge command is only available on CVS command-line filesystems. For more information about merging files with CVS, consult your CVS documentation.

To use the Merge command from the Explorer:

  1. Right-click the file's node in the Explorer and choose CVS Branching and Tagging Merge.
  2. In the Merge dialog, enter the revision number or tag for the revisions you want to merge into your working copy. You can click Select to choose from a list of all revisions and branches for the file.

To use the Merge command from the Versioning Explorer:

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

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

  4. See also
    Mounting a CVS Filesystem
    Calling CVS Commands
    CVS Commands
    Saving Advanced CVS Command Options
    Reconfiguring a CVS Filesystem
    Global Settings for VCS Filesystems

    Legal Notices