From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov 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 21:02:01 +0300 Message-ID: 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; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="36749"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Cc: Juri Linkov , Po Lu , "Alfred M. Szmidt" , eliz@gnu.org, emacs-devel@gnu.org To: Lars Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Aug 31 20:03:51 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 1oTS47-0009OJ-6G for ged-emacs-devel@m.gmane-mx.org; Wed, 31 Aug 2022 20:03:51 +0200 Original-Received: from localhost ([::1]:56180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oTS46-0005q0-35 for ged-emacs-devel@m.gmane-mx.org; Wed, 31 Aug 2022 14:03:50 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34538) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTS2u-0004lz-Qp for emacs-devel@gnu.org; Wed, 31 Aug 2022 14:02:37 -0400 Original-Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:46962) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oTS2s-0000Lq-Pc; Wed, 31 Aug 2022 14:02:36 -0400 Original-Received: by mail-wr1-x42b.google.com with SMTP id e20so19261133wri.13; Wed, 31 Aug 2022 11:02:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc; bh=BiY5vXKZI3bVuK3LqPBmdMOrTPWwGft9JyxpoTV5oyA=; b=e3eQ7VW0C9LnCCwWHVDmTxclLHQgChFB5csvC7ysPLYz1KnxM3pATaZgsqZk1JlV9J mLaX53P1jMRRBuiDWUGZg6wv80DTE8qkIQwdjIK9C9GUdWbK7g2DYROxSDK1z3LOg7Ic w2b54Qpp1tBQf86gesr0p4xVXx0MSjf7ze6TnbMe3jPxdcItxmNT67cGFtYVQrMMvLnS gYBsqfLsjNmebvJ9b8gKWHbyWwyfLPP/8xcAj14wpOIEvEbIrWz29EOFuAvJSykm3088 A0Rb8VVFUEUDlGnb1RqdjMTJhc4OjA4Cy0wQiE7anhScK0Crp2K0XiaMvWnJBtQTX331 UjcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc; bh=BiY5vXKZI3bVuK3LqPBmdMOrTPWwGft9JyxpoTV5oyA=; b=LzV2YhrFcMR/rOkG5ONV9f5ABnJv1cxDl3i98aw+NTFr5YHXaMUCZ1Mr2oypwyXjoT O+xYVS6m9mYORM6GfsSmTTTC2JnmmJOy1orv5VCFTqcMYOMFTvhWrCLTZcCahJcHfnx+ wWBKM7KW1YR+bJfRj4HGp0Tf7DxEKwCkjQQY3VhOwhc188CqatGtK8mW0RaJt0sYlcrD cV4S98kl8b6d00yWaAGKcpbUEo7r2eJ7Ap8Gcw8yswuyciUnTLAwfn/MWn8HvbxCyJT0 SO8wkGaZHreb2zL4/LA5v4wy6A9EJMm0YR2Oe3n33XegKjG/iJtYEL7X239CKer0WXBk f3uw== X-Gm-Message-State: ACgBeo3gbFMhvt5LM9bSQJ1SzNrgQLkySBL/xd7ywFj3uLXFSaBWuRf0 aDyLVASHvqvpdBQXuwIFOFU= X-Google-Smtp-Source: AA6agR6VSPpmSHZE06gGAetJQqFR4W4//+sxxE1QBFlo2/pQrCJtt3/dN3gqRrMYDvhM6Yhmoiz3OQ== X-Received: by 2002:a5d:5989:0:b0:221:7c34:3943 with SMTP id n9-20020a5d5989000000b002217c343943mr11796349wri.441.1661968924288; Wed, 31 Aug 2022 11:02:04 -0700 (PDT) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id p17-20020a05600c05d100b003a5bd9448e5sm2664155wmd.28.2022.08.31.11.02.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 31 Aug 2022 11:02:03 -0700 (PDT) Content-Language: en-US In-Reply-To: <87ilm8e5am.fsf@gnus.org> Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=raaahh@gmail.com; helo=mail-wr1-x42b.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, GAPPY_SUBJECT=0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: 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:294452 Archived-At: On 31.08.2022 19:39, Lars Ingebrigtsen wrote: > 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. 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. > It seems easier, even -- you don't have to manage a bunch of files. True.