From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier via Users list for the GNU Emacs text editor Newsgroups: gmane.emacs.help Subject: Re: editing a VC diff to modify the current version Date: Wed, 23 Feb 2022 21:37:09 -0500 Message-ID: References: Reply-To: Stefan Monnier Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3325"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) To: help-gnu-emacs@gnu.org Cancel-Lock: sha1:7x0JnhPWNpJhWXTo0h6+I22iaVo= Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Thu Feb 24 03:38:16 2022 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nN41H-0000la-T3 for geh-help-gnu-emacs@m.gmane-mx.org; Thu, 24 Feb 2022 03:38:15 +0100 Original-Received: from localhost ([::1]:59240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nN41G-0000gN-E5 for geh-help-gnu-emacs@m.gmane-mx.org; Wed, 23 Feb 2022 21:38:14 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:42972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nN40Q-0000gB-1g for help-gnu-emacs@gnu.org; Wed, 23 Feb 2022 21:37:23 -0500 Original-Received: from ciao.gmane.io ([116.202.254.214]:51932) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nN40L-0003xF-0e for help-gnu-emacs@gnu.org; Wed, 23 Feb 2022 21:37:20 -0500 Original-Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1nN40I-000A1N-4k for help-gnu-emacs@gnu.org; Thu, 24 Feb 2022 03:37:14 +0100 X-Injected-Via-Gmane: http://gmane.org/ Received-SPF: pass client-ip=116.202.254.214; envelope-from=geh-help-gnu-emacs@m.gmane-mx.org; helo=ciao.gmane.io X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "help-gnu-emacs" Xref: news.gmane.io gmane.emacs.help:136175 Archived-At: > 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