From: "Stefan Monnier" <monnier+gnu/emacs@rum.cs.yale.edu>
Cc: monnier+gnu/emacs@rum.cs.yale.edu
Subject: Re: 4 minor suggestions for files.el
Date: Tue, 06 May 2003 09:00:03 -0400 [thread overview]
Message-ID: <200305061300.h46D03jk011242@rum.cs.yale.edu> (raw)
In-Reply-To: E19CzSy-0006FH-00@fencepost.gnu.org
> We already have that. vc-merge (C-x v m) can do it; just specify the
> version numbers in reverse. E.g. typing C-x v m 1.4 RET 1.2 RET takes
> out the changes that were made from version 1.2 to 1.4.
>
> (I didn't know about vc-merge.)
>
> For vc-merge, since that is an explicit command to apply a patch to
> the buffer, I think it would be right for the patch to be undoable.
> Is it undoable now?
No.
> Could it be made so? Would that require a change
> somewhat like the one Stefan proposed?
Yes, indeed.
My suggested change indeed allows the change to be undone.
The reason is the following: vc-merge works on the file rather than
on the buffer, so after the merge happens, VC does a revert-buffer
(unless the buffer was modified), so my suggested change allows
you to undo it because it can undo the revert-buffer.
Stefan
next prev parent reply other threads:[~2003-05-06 13:00 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-04-14 20:22 4 minor suggestions for files.el Stefan Monnier
2003-04-15 19:14 ` Kai Großjohann
2003-04-15 20:16 ` Kevin Rodgers
2003-04-16 4:40 ` Richard Stallman
2003-04-17 21:39 ` Stefan Monnier
2003-04-18 11:28 ` Richard Stallman
2003-04-18 13:24 ` Andre Spiegel
2003-04-18 14:23 ` Stefan Monnier
2003-04-18 14:36 ` Andre Spiegel
2003-04-18 14:40 ` Stefan Monnier
2003-04-19 19:11 ` Stefan Monnier
2003-04-22 0:45 ` Richard Stallman
2003-04-19 13:35 ` Richard Stallman
2003-04-29 21:07 ` Stefan Monnier
2003-05-05 14:32 ` Richard Stallman
2003-05-05 14:52 ` Andre Spiegel
2003-05-06 10:14 ` Richard Stallman
2003-05-06 10:56 ` Andre Spiegel
2003-05-07 11:51 ` Richard Stallman
2003-05-07 12:31 ` Andre Spiegel
2003-05-07 14:26 ` Stefan Monnier
2003-05-09 11:20 ` Richard Stallman
2003-05-06 13:00 ` Stefan Monnier [this message]
2003-05-07 11:50 ` Richard Stallman
2003-05-05 14:57 ` Stefan Monnier
2003-05-06 10:14 ` Richard Stallman
2003-05-06 12:54 ` Stefan Monnier
2003-05-07 11:50 ` Richard Stallman
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=200305061300.h46D03jk011242@rum.cs.yale.edu \
--to=monnier+gnu/emacs@rum.cs.yale.edu \
/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).