mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-16 09:14:18 +00:00
; * doc/emacs/vc1-xtra.texi (Other Working Trees): Better example.
This commit is contained in:
parent
b5cf0786a2
commit
17ef2d64e4
1 changed files with 8 additions and 11 deletions
|
|
@ -482,20 +482,17 @@ do and do not exist. In other words, the file or directory the current
|
|||
buffer visits probably exists in other working trees too, and this
|
||||
command lets you switch to those versions of the file.
|
||||
|
||||
@c FIXME: It would be better to use @kbd{=} from a *vc-change-log*
|
||||
@c buffer as the example here, because 'C-x v =' and 'C-x v D' are more
|
||||
@c likely to be uncommitted changes on which you'd use 'C-x v w a'.
|
||||
@c That requires a new node for bindings available in *vc-change-log*s.
|
||||
@kbd{C-x v w w} also works in Diff mode (@pxref{Diff Mode}) and Log View
|
||||
mode (@pxref{Old Revisions}). Instead of switching to a different
|
||||
mode (@pxref{VC Change Log}). Instead of switching to a different
|
||||
buffer, the command changes the default directory of the buffer to the
|
||||
corresponding directory under another working tree. This is
|
||||
particularly useful with Diff mode buffers generated by VC commands,
|
||||
such as @kbd{C-x v =} and @kbd{C-x v D} (@pxref{Old Revisions}). You
|
||||
can use @kbd{C-x v w w} and then standard Diff mode commands like
|
||||
@w{@kbd{C-c C-a}} (@code{diff-apply-hunk}) and @kbd{C-c RET C-a}
|
||||
(@code{diff-apply-buffer}) to apply hunks from one working tree to
|
||||
another.
|
||||
particularly useful from Log View mode buffers generated by commands
|
||||
like @kbd{C-x v L} (@pxref{VC Change Log}). After using @kbd{C-x v w w}
|
||||
to change the default directory of the Log View buffer, you can move
|
||||
point to a revision of interest and type @kbd{=} (@code{log-view-diff})
|
||||
to open a Diff mode buffer with that revision's changes. Then you can
|
||||
use standard Diff mode commands like @w{@kbd{C-c C-a}}
|
||||
(@code{diff-apply-hunk}) to apply hunks to the other working tree.
|
||||
|
||||
@kindex C-x v w k
|
||||
@findex vc-kill-other-working-tree-buffers
|
||||
|
|
|
|||
Loading…
Reference in a new issue