unofficial mirror of help-gnu-emacs@gnu.org
 help / color / mirror / Atom feed
From: emacsq via Users list for the GNU Emacs text editor <help-gnu-emacs@gnu.org>
To: emacsq via Users list for the GNU Emacs text editor
	<help-gnu-emacs@gnu.org>
Subject: Re: editing a VC diff to modify the current version
Date: Thu, 24 Feb 2022 04:19:04 +0000	[thread overview]
Message-ID: <TSMikdluQSNNVCrQxOvAN_Pc8OVmgXTcUESuv3vZ1_I_-rdVi22ayBq3LX2Qhm-b60u5DzuwNHie65quTUFD28FMVbaSyxb8VIYnSYfME8k=@protonmail.com> (raw)
In-Reply-To: <LAbyoVNVIvBhIG9719Ay1kXiXj1KXRwWwUPuNLXN1UMSfcf06ZUjnSnBBm9a6Cj04nHftMNaiZhQGUX8jmozQ5LeWqZ2IqQbXmQi6dw1hdA=@protonmail.com>

> When I modify a file under VC then I always make a diff before checkin to see everything is right. Sometimes the changes have a typo or a simple modification occurs to me which could be done right in the diff. 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.

Also, you can stage/unstage or revert selected ranges in the diff which is also handy:

https://user-images.githubusercontent.com/4114656/50283979-79913e00-044f-11e9-910f-c8b878148132.png

I'm not sure if a range here is equivalent to a diff hunk or you can stage/revert parts of a hunk which could also be useful.

I know I can split a hunk in emacs diff mode, and it also occured to me if emacs could support reverting some lines, or even just a region within lines, without having to split the hunk first manually .

  parent reply	other threads:[~2022-02-24  4:19 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
2022-02-24  4:19 ` emacsq via Users list for the GNU Emacs text editor [this message]
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='TSMikdluQSNNVCrQxOvAN_Pc8OVmgXTcUESuv3vZ1_I_-rdVi22ayBq3LX2Qhm-b60u5DzuwNHie65quTUFD28FMVbaSyxb8VIYnSYfME8k=@protonmail.com' \
    --to=help-gnu-emacs@gnu.org \
    --cc=laszlomail@protonmail.com \
    /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).