unofficial mirror of help-gnu-emacs@gnu.org
 help / color / mirror / Atom feed
From: Stefan Monnier via Users list for the GNU Emacs text editor <help-gnu-emacs@gnu.org>
To: help-gnu-emacs@gnu.org
Subject: Re: editing a VC diff to modify the current version
Date: Wed, 23 Feb 2022 21:37:09 -0500	[thread overview]
Message-ID: <jwvk0dlq9nm.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: LAbyoVNVIvBhIG9719Ay1kXiXj1KXRwWwUPuNLXN1UMSfcf06ZUjnSnBBm9a6Cj04nHftMNaiZhQGUX8jmozQ5LeWqZ2IqQbXmQi6dw1hdA=@protonmail.com

> With vscode you can actually edit the diff and the changes are
> reflected back to the current version, so you don't have to go back to
> the file, do the modifications, make a diff again to see everything is
> right, etc.

Sounds like a great feature.  I'd love to see such a thing added to `diff-mode`.

> So it seems like emacs supports the other direction, treating the diff as
> a patch file which can be applied to the original to get the
> current version.

Yes, most of `diff-mode` features currently available are designed to
let you change the diff before you do something with it (such as split
a hunk so as to apply/unapply only one part).
That's somewhat related to the above VSCode feature but it's indeed not
the same.


        Stefan




  reply	other threads:[~2022-02-24  2:37 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-24  2:22 editing a VC diff to modify the current version emacsq via Users list for the GNU Emacs text editor
2022-02-24  2:37 ` Stefan Monnier via Users list for the GNU Emacs text editor [this message]
2022-02-24  4:19 ` emacsq via Users list for the GNU Emacs text editor
2022-02-24  4:29 ` Prabath Liyanage
2022-02-25 16:19 ` emacsq

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=jwvk0dlq9nm.fsf-monnier+emacs@gnu.org \
    --to=help-gnu-emacs@gnu.org \
    --cc=monnier@iro.umontreal.ca \
    /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.
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).