(pcl-cvs.info)Viewing differences


Next: Emerge Prev: Ignoring files Up: Commands

Viewing differences
===================

`d'
     Display a `cvs diff' between the selected files and the RCS version
     that they are based on.  Note: Customization describes how you
     can send flags to `cvs diff'.  If CVS-DIFF-IGNORE-MARKS is set to a
     non-`nil' value or if a prefix argument is given (but not both) any
     marked files will not be considered to be selected.
     (`cvs-mode-diff-cvs').

`b'
     If CVS finds a conflict while merging two versions of a file
     (during a `cvs update', Note: Updating the directory.) it will
     save the original file in a file called `.#FILE.VERSION' where
     FILE is the name of the file, and VERSION is the RCS version
     number that your file was based on.

     With the `b' command you can run a `diff' on the files
     `.#FILE.VERSION' and `FILE'.  You can get a context- or Unidiff by
     setting `cvs-diff-flags' - Note: Customization..  This command
     only works on files that have status `Conflict' or `Merged'.

     If CVS-DIFF-IGNORE-MARKS is set to a non-`nil' value or if a
     prefix argument is given (but not both) any marked files will not
     be considered to be selected.  (`cvs-mode-diff-backup').


automatically generated by info2www