diff options
| author | Chong Yidong | 2010-03-25 20:04:48 -0400 |
|---|---|---|
| committer | Chong Yidong | 2010-03-25 20:04:48 -0400 |
| commit | ef7b27ef14161df98ee199ace01258fc54aea013 (patch) | |
| tree | a00bbff0848b700017cfe73336e6d89caa22979e /doc | |
| parent | 431af6a4be891b9d0cf2774d350b73548421b3ef (diff) | |
| download | emacs-ef7b27ef14161df98ee199ace01258fc54aea013.tar.gz emacs-ef7b27ef14161df98ee199ace01258fc54aea013.zip | |
* maintaining.texi (Old Revisions): Document vc-root-diff.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/ChangeLog | 2 | ||||
| -rw-r--r-- | doc/emacs/maintaining.texi | 31 |
2 files changed, 21 insertions, 12 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index dbed31f865c..ca70c699b72 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | repository if there is none. | 4 | repository if there is none. |
| 5 | (VC Change Log): Rename from VC Status. Document vc-log-show-limit and | 5 | (VC Change Log): Rename from VC Status. Document vc-log-show-limit and |
| 6 | vc-print-root-log. | 6 | vc-print-root-log. |
| 7 | (Old Revisions): Copyedits. | 7 | (Old Revisions): Copyedits. Document vc-root-diff. |
| 8 | 8 | ||
| 9 | * programs.texi (Program Modes): Mention Javascript mode. | 9 | * programs.texi (Program Modes): Mention Javascript mode. |
| 10 | 10 | ||
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 87292968e14..8cc5b97d919 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi | |||
| @@ -647,14 +647,18 @@ to examine any revision of a file, or compare two revisions. | |||
| 647 | 647 | ||
| 648 | @table @kbd | 648 | @table @kbd |
| 649 | @item C-x v ~ | 649 | @item C-x v ~ |
| 650 | Prompt for a revision of the visited file, and visit it in a buffer of | 650 | Prompt for a revision of the current file, and visit it in a buffer of |
| 651 | its own (@code{vc-revision-other-window}). | 651 | its own (@code{vc-revision-other-window}). |
| 652 | 652 | ||
| 653 | @item C-x v = | 653 | @item C-x v = |
| 654 | Compare the buffer associated with the current fileset with the | 654 | Compare the files in the current fileset with the working revision(s) |
| 655 | working revision(s) from which you started editing (@code{vc-diff}). | 655 | you started from (@code{vc-diff}). With a prefix argument, prompt for |
| 656 | With a prefix argument, prompt for two revisions of the current | 656 | two revisions of the current fileset and compare them. |
| 657 | fileset and compare them. | 657 | |
| 658 | @item C-x v D | ||
| 659 | Compare the entire tree corresponding to the current fileset with the | ||
| 660 | tree you started from (@code{vc-root-diff}). With a prefix argument, | ||
| 661 | prompt for two revisions and compare their trees. | ||
| 658 | 662 | ||
| 659 | @item C-x v g | 663 | @item C-x v g |
| 660 | Display an annotated version of the file: for each line, show the | 664 | Display an annotated version of the file: for each line, show the |
| @@ -679,12 +683,11 @@ buffer in a separate window. | |||
| 679 | 683 | ||
| 680 | @findex vc-diff | 684 | @findex vc-diff |
| 681 | @kindex C-x v = | 685 | @kindex C-x v = |
| 682 | @kbd{C-x v =} (@code{vc-diff}) compares the current buffer contents | 686 | @kbd{C-x v =} (@code{vc-diff}) compares each file in the current VC |
| 683 | of each file in the current VC fileset (saving them if necessary) with | 687 | fileset (saving them if necessary) with the repository revision(s) |
| 684 | the repository revision from which you started editing. Note that the | 688 | from which you started editing. Note that the latter may or may not |
| 685 | latter may or may not be the latest revision of the file(s). The diff | 689 | be the latest revision of the file(s). The diff is displayed in a |
| 686 | is displayed in a special buffer in another window. @xref{Comparing | 690 | special buffer in another window. @xref{Comparing Files}. |
| 687 | Files}. | ||
| 688 | 691 | ||
| 689 | @findex vc-diff | 692 | @findex vc-diff |
| 690 | @kindex C-u C-x v = | 693 | @kindex C-u C-x v = |
| @@ -706,6 +709,12 @@ revision ID for a multi-file fileset (as opposed to a symbolic tag | |||
| 706 | name) is unlikely to return diffs that are connected in any meaningful | 709 | name) is unlikely to return diffs that are connected in any meaningful |
| 707 | way. | 710 | way. |
| 708 | 711 | ||
| 712 | The command @kbd{C-x v D} (@code{vc-root-diff}) is similar to | ||
| 713 | @kbd{C-x v =}, but it compares the entire tree associated with the | ||
| 714 | current VC fileset with the tree you started with. This means all the | ||
| 715 | files controlled by the current version control repository, even those | ||
| 716 | that are not part of the current VC fileset. | ||
| 717 | |||
| 709 | If you invoke @kbd{C-x v =} or @kbd{C-u C-x v =} from a buffer that | 718 | If you invoke @kbd{C-x v =} or @kbd{C-u C-x v =} from a buffer that |
| 710 | is neither visiting a version-controlled file nor a VC directory | 719 | is neither visiting a version-controlled file nor a VC directory |
| 711 | buffer, these commands generate a diff of all registered files in the | 720 | buffer, these commands generate a diff of all registered files in the |