From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: master 4803fba487 1/2: 'C-x v v' on a diff buffer commits it as a patch (bug#52349) Date: Thu, 01 Sep 2022 12:16:07 +0200 Message-ID: <87k06nz9g8.fsf@gnus.org> References: <166171593185.16640.41619657947456727@vcs2.savannah.gnu.org> <20220828194533.23A6BC00889@vcs2.savannah.gnu.org> <87r10znm0y.fsf@gnus.org> <83fshfvvyn.fsf@gnu.org> <999d1cb2-6b7f-8020-5202-e919278d895e@yandex.ru> <877d2pnqup.fsf@yahoo.com> <86zgfknc9a.fsf@mail.linkov.net> <87sflc91q7.fsf@gnus.org> <87wnao7l74.fsf@gnus.org> <0d5679a1-7635-53db-51c7-0ac0e35325d8@yandex.ru> <87mtbke7wf.fsf@gnus.org> <87ilm8e5am.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="33232"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: Juri Linkov , Po Lu , "Alfred M. Szmidt" , eliz@gnu.org, emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Sep 01 12:19:17 2022 Return-path: Envelope-to: ged-emacs-devel@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 1oThI4-0008Rq-E8 for ged-emacs-devel@m.gmane-mx.org; Thu, 01 Sep 2022 12:19:16 +0200 Original-Received: from localhost ([::1]:41158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oThI0-0005ii-S3 for ged-emacs-devel@m.gmane-mx.org; Thu, 01 Sep 2022 06:19:12 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41416) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oThF9-0001aj-KQ for emacs-devel@gnu.org; Thu, 01 Sep 2022 06:16:19 -0400 Original-Received: from quimby.gnus.org ([2a01:4f9:2b:f0f::2]:40726) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oThF8-00019I-6T; Thu, 01 Sep 2022 06:16:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:Date:References: In-Reply-To:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=J8EuZgBsYa/xMiuhnyAYgw5cm08Ahy/L3eO0TSpVJDs=; b=sCBWGp8OxqS4LP+7ejqId5a/SC K9Tl9cZr5bqPMcRQsuEBKg7fBX7OoZq88lt9GEfZcB6ZAJFPhvteCbWjH+BMCGjTXNyZXHMKCpZ0u sU+qUCBpfMKtKIou3HqbrDaZiIm2/5X2nn+lUoH7cNDPG1y23H1OMxX9LefA928PFyhw=; Original-Received: from [84.212.220.105] (helo=joga) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oThF2-0001tP-Hk; Thu, 01 Sep 2022 12:16:10 +0200 In-Reply-To: (Dmitry Gutov's message of "Wed, 31 Aug 2022 21:02:01 +0300") Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAG1BMVEUpGx8QDhNeFxyl EhjJExezXUGwpo9LT0v///+nCMuGAAAAAWJLR0QIht6VegAAAAd0SU1FB+YJAQoLIoJmStIAAAGz SURBVDjLpdPLbqMwFABQG8p4azvKrMMjeyd2Z13h+wFJK2CbjoTZopGCf78mvMyErmopEuRwH5hr hBjaXuyb9XNAm+BX9C7pqpPlmgZ4O2eSYLwBgZTyLPEzKKlAy/MTcAn9kof/IRjAkwFQoDSmQepE +ECRgvjoHnaiEw8QBxHV9fsg8Qx9DlRgYt4ZTUGf8QQoUXnU2pYWJ9c3gBiB8hTiiljb7l2ylwUw V3p3sZ2xbS3YDuA0pQrhbe/+N6btPjAHPddI4XS05pP9vqHyQlU+doWZhLgghifUWFKzTE/tUqVZ ZW/HInZlongBrnJadZ9FIThp7DUbU2EW9PCrLeuP8q+x1zD3IlgPrq26WyIGKMjtzwOia3aeAXL2 Skxk3WqiVYRmx0vXukEmdn/NhA9hQ24IuZCuugv/PXiJyD97N6ayLZq3xH0++tq47bWlwfPHc78M YpYWfYV7Q/szc5h398S4GM9RcEBsgr5fit1IUJeexwhTDx7DwvAy449hUHq+xT70bU1nYQ0ZiNX9 fIjCscijjn/qdguspz38Dnbwtg3pUnwN2TB8WxHxNoSAn+ALR0KIlc1uNFQAAAAldEVYdGRhdGU6 Y3JlYXRlADIwMjItMDktMDFUMTA6MTE6MzQrMDA6MDCbZNVGAAAAJXRFWHRkYXRlOm1vZGlmeQAy MDIyLTA5LTAxVDEwOjExOjM0KzAwOjAw6jlt+gAAAABJRU5ErkJggg== X-Now-Playing: Gong Splat's _Gong Splat_: "Toagut" Received-SPF: pass client-ip=2a01:4f9:2b:f0f::2; envelope-from=larsi@gnus.org; helo=quimby.gnus.org X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, GAPPY_SUBJECT=0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:294472 Archived-At: Dmitry Gutov writes: >> Yes. But I think you could just do that here, too? I.e., instead >> of >> copying and managing files, you can just write the `C-x v D' diff to a >> file, apply reverted diff, apply user-edited patch, commit, reverse >> edited patch, apply diff from file. > > If you like, I can take this route as well. It seems a bit more > error-prone, though: some unknown bug in diff-apply-hunk might make it > fail at the end, or even corrupt the file contents silently. > > 'cp' seems more bullet-proof in that regard. You should be able to get back to the previous state reliably by reverting to the repository state and then applying the saved patch, though. Which is basically what git does with stashes, anyway...