From: Mauro Aranda <maurooaranda@gmail.com>
To: 35290@debbugs.gnu.org
Subject: bug#35290: 27.0.50; Outdated vc-revert documentation
Date: Mon, 15 Apr 2019 13:08:49 -0300 [thread overview]
Message-ID: <CABczVwf+4HxRbuxAZOh+qBo8VwzD+gjOj2Q4WP=Cyfi+dzxUxQ@mail.gmail.com> (raw)
In-Reply-To: <CABczVweE3GWoGq=EjbN2S+hBpZuYCQC2UW37XxUtGKOg=-wrXg@mail.gmail.com>
[-- Attachment #1.1: Type: text/plain, Size: 741 bytes --]
Tags: patch
How about the following?
Best regards,
Mauro.
El lun., 15 abr. 2019 a las 12:59, Mauro Aranda (<maurooaranda@gmail.com>)
escribió:
> In the same spirit as Bug#33084 [1], the documentation of vc-revert is
> outdated.
>
> 1) C-h r
> 2) m VC Undo
>
> Read this sentence:
> Note that ‘C-x v u’ cannot be reversed with the usual undo commands
> (see Undo), so use it with care.
>
> To check it is outdated:
> 1) emacs -Q
> 2) C-x C-f FILE-UNDER-VERSION-CONTROL
> 3) Make some changes and then C-x C-s
> 4) Revert: C-x v u
> 5) Confirm: yes RET
> 6) After reverting is done, type C-/
> 7) Observe that you got your changes back.
>
> [1]: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=33084
>
>
[-- Attachment #1.2: Type: text/html, Size: 1280 bytes --]
[-- Attachment #2: 0001-Update-vc-revert-documentation.patch --]
[-- Type: text/x-patch, Size: 1311 bytes --]
From 6a74521e9ab8211f03a3e3cc6e941c2abd3d8e47 Mon Sep 17 00:00:00 2001
From: Mauro Aranda <maurooaranda@gmail.com>
Date: Mon, 15 Apr 2019 12:58:36 -0300
Subject: [PATCH] Update vc-revert documentation
* doc/emacs/maintaining.texi (VC Undo): Document that it is possible
to use undo commands after vc-revert. (Bug#35290)
---
doc/emacs/maintaining.texi | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index fd0119e..6f10033 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1093,8 +1093,9 @@ VC Undo
If you agree, the fileset is reverted. If you don't want @kbd{C-x v
u} to show a diff, set the variable @code{vc-revert-show-diff} to
@code{nil} (you can still view the diff directly with @kbd{C-x v =};
-@pxref{Old Revisions}). Note that @kbd{C-x v u} cannot be reversed
-with the usual undo commands (@pxref{Undo}), so use it with care.
+@pxref{Old Revisions}). Because reverting acts like a single
+modification of the buffer contents, it is possible to bring all
+the reverted changes back with a single @code{undo} command (@pxref{Undo}).
On locking-based version control systems, @kbd{C-x v u} leaves files
unlocked; you must lock again to resume editing. You can also use
--
2.7.4
next prev parent reply other threads:[~2019-04-15 16:08 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-15 15:54 bug#35290: 27.0.50; Outdated vc-revert documentation Mauro Aranda
2019-04-15 16:08 ` Mauro Aranda [this message]
2019-04-15 16:14 ` Eli Zaretskii
2019-04-15 17:16 ` Dmitry Gutov
2019-04-15 18:19 ` Eli Zaretskii
2019-04-15 20:25 ` Dmitry Gutov
2019-04-15 22:25 ` Mauro Aranda
2019-04-16 15:28 ` Eli Zaretskii
2019-04-15 17:44 ` Mauro Aranda
2019-04-15 18:23 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CABczVwf+4HxRbuxAZOh+qBo8VwzD+gjOj2Q4WP=Cyfi+dzxUxQ@mail.gmail.com' \
--to=maurooaranda@gmail.com \
--cc=35290@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).