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: Wed, 31 Aug 2022 18:39:13 +0200 Message-ID: <87ilm8e5am.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> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="27467"; 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 Wed Aug 31 18:41:00 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 1oTQlt-0006xX-VU for ged-emacs-devel@m.gmane-mx.org; Wed, 31 Aug 2022 18:40:57 +0200 Original-Received: from localhost ([::1]:32780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oTQls-0007PW-HU for ged-emacs-devel@m.gmane-mx.org; Wed, 31 Aug 2022 12:40:56 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:57864) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTQkL-0004YC-EZ for emacs-devel@gnu.org; Wed, 31 Aug 2022 12:39:21 -0400 Original-Received: from quimby.gnus.org ([2a01:4f9:2b:f0f::2]:33278) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTQkJ-0004Ln-My; Wed, 31 Aug 2022 12:39:21 -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=NgybiPOG6LVvIrWkBXjuQMBrU15d42aZMr8NQC5jz/U=; b=a14k/tLaffUjJkGjrhDU2/8YK1 xx6IaZbM0luH+j1zVo8PtwmOHfYKYvCorpQr74tjqzd1SDTvjz4cXoSF4PSuG+D/NNJ1RFyk0PzVW UlDWlcbkuuoD2znwsmesV147nT1Piie+6vW2/qZ+kpve5y8WaYWDcJMZV1GicTNxbiHc=; 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 1oTQkE-0002qM-4W; Wed, 31 Aug 2022 18:39:16 +0200 In-Reply-To: (Dmitry Gutov's message of "Wed, 31 Aug 2022 19:24:28 +0300") Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAADFBMVEXY1MKSZ2BIRD// ////4AazAAAAAWJLR0QDEQxM8gAAAAd0SU1FB+YIHxAkBjBuudQAAAF0SURBVCjPPdGxittAEAbg kbndQpUPbIOuT8j5KVaQpEilwiM4VSbYAe9T+Mp0m8Pr4ioXWrH7P2VmZckCCT5mZjX6RSpgaJI/ UL6UQ9ghTDjbcIDvZ6Qv+Ddji9VwnbH52AETnL72QLzjViA8KpG2vpsrOyJmWt4h95rlwUagnFJs tp75Rqrq7TsbRIU9qdOp3bMJsURDaoOrYzoeXq20PffDuaLV8lsp+Or+mCeqmtffAtAL0bJyqmhI w7w4LcuV9VIqnx9RI9m/TxkIURMw9CNOURsAjjJ+xNJbtOeMcIllY2ORt8bgL4uA2/gJ+IRbBDuh Rd8m7UYkRuwiNRnas43cm9VUsXF9JvV9nPFd1BfSv6RRcfU29t/TKbxkxTmcHNXxp2yGCaqTF/sp RGWB7YxC0D0gE5154FZ0bp5JRNPWI2qE+eh13dhEOR2B/CmbTH3HnhZIVIxtuqcNQIsRZaK8m2Sd gRpITroV7RS3wfLxrfkPV1CbwxASRxcAAAAldEVYdGRhdGU6Y3JlYXRlADIwMjItMDgtMzFUMTY6 MzY6MDYrMDA6MDAcWWU1AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIyLTA4LTMxVDE2OjM2OjA2KzAw OjAwbQTdiQAAAABJRU5ErkJggg== X-Now-Playing: Frank Chickens's _Make More Noise (3)_: "We Are Ninja" 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:294442 Archived-At: Dmitry Gutov writes: > I don't use stashing commands from VC myself, but the stash mechanism > is usually more complex, e.g. it usually knows how to merge changes > (when the user has edited the file in some place and then pops the > stash) and indicate conflicts. > > That's why a stash is usually represented as a diff, I guess. 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. It seems easier, even -- you don't have to manage a bunch of files.