Next: , Previous: Ignoring files, Up: Commands

5.13 Viewing differences

=
d =
Display a ‘cvs diff’ between the selected files and the version that they are based on (cvs-mode-diff).
d b
If CVS finds a conflict while merging two versions of a file (during a ‘cvs update’, see Updating the buffer) it will save the original file in a file called .#file.version where file is the name of the file, and version is the revision number that file was based on.

With the d b command you can run a ‘diff’ on the files .#file.version and file.

d h
Display a ‘cvs diff’ between the selected files and the head revision (the most recent version on the current branch) in the repository (cvs-mode-diff-head).
d r
Display a ‘cvs diff’ between the base revision of the selected files and the head revision in the repository. This displays the changes anyone has committed to the repository since you last executed a checkout, update or commit operation (cvs-mode-diff-repository).
d v
Display a ‘cvs diff’ between the selected files and the head revision of the vendor branch in the repository (cvs-mode-diff-vendor).
d y
Display a ‘cvs diff’ between the selected files and yesterday's head revision in the repository (cvs-mode-diff-yesterday).

By default, ‘diff’ commands ignore the marks. This can be changed with cvs-invert-ignore-marks.