unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Andre Spiegel <spiegel@gnu.org>
Cc: monnier+gnu/emacs@rum.cs.yale.edu
Subject: Re: 4 minor suggestions for files.el
Date: 06 May 2003 12:56:55 +0200	[thread overview]
Message-ID: <1052218614.509.109.camel@localhost> (raw)
In-Reply-To: <E19CzSy-0006FH-00@fencepost.gnu.org>

On Tue, 2003-05-06 at 12:14, Richard Stallman wrote:

> 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?  Could it be made so?  Would that require a change
> somewhat like the one Stephan proposed?

You can always use the symmetric operation, of course.  You can take out
the changes from 1.2 to 1.4 using vc-merge, and then you can reapply
them by simply reversing the arguments again.

I don't think it's wise to make this available through the general undo
mechanism.  For example, vc-merge may also detect conflicts with your
own changes, and you need to resolve them before the merge operation is
actually finished.  How would you undo that?  This is getting very
complicated, and I think it's wiser just to provide the user with
symmetric operations.

  reply	other threads:[~2003-05-06 10:56 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 [this message]
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
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=1052218614.509.109.camel@localhost \
    --to=spiegel@gnu.org \
    --cc=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).