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: Tue, 30 Aug 2022 15:03:11 +0300 Message-ID: <8331b5ac-36f4-88ed-f68a-7cc6958214a7@yandex.ru> References: <166171593185.16640.41619657947456727@vcs2.savannah.gnu.org> <20220828194533.23A6BC00889@vcs2.savannah.gnu.org> <87r10znm0y.fsf@gnus.org> <83fshfvvyn.fsf@gnu.org> <865yia2opx.fsf@mail.linkov.net> 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="34658"; 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: Eli Zaretskii , Lars Ingebrigtsen , emacs-devel@gnu.org To: Juri Linkov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Aug 30 14:09:49 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 1oT03v-0008na-QT for ged-emacs-devel@m.gmane-mx.org; Tue, 30 Aug 2022 14:09:47 +0200 Original-Received: from localhost ([::1]:33536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oT03u-0008Mv-B7 for ged-emacs-devel@m.gmane-mx.org; Tue, 30 Aug 2022 08:09:46 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:47370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oSzy4-0004Qy-0x for emacs-devel@gnu.org; Tue, 30 Aug 2022 08:03:48 -0400 Original-Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:41789) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oSzy1-0005IS-FP; Tue, 30 Aug 2022 08:03:43 -0400 Original-Received: by mail-wr1-x435.google.com with SMTP id v16so11181771wrm.8; Tue, 30 Aug 2022 05:03:19 -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=TEUjMGCopT0UYhjBzoh6sIejW5xpCTXi7T6LyJy3MfE=; b=YFU2w7Go/wVHRwxUwaHLEdMVtqZ21X3GbHhLfcR3OkX6RdzKtpQZPOtI7GzhOU4f9e yl23iwrfXfvJwDvO1dJxG/DbnyXNZIohtlyBWRCBk2gcyR3tlfk5YhAtumWpGCowH8lo E/h7VuZRXqdl8lHhsqW+bUsQs/XR8q6ywyuJogoj452CeL2XKzAe8KE3IFIk587qG/4C ksrjQk4kG3dSa1Bvp5nYUW4wWYBa/ciG/P+QV5s2fnYT+3xs6FjvkrCd+q7O2XIVHX+K RMnFdZrbzlNB46DGZ7tJVSTFWWjtuRTTE2F5B+Mjbuy/+l4WaZQC8+2gpdEMv5plQY+s OLAA== 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=TEUjMGCopT0UYhjBzoh6sIejW5xpCTXi7T6LyJy3MfE=; b=KmIbjhKIKEbfCHjRN56EAHwsXdcLVDL02Pcl3CJXMTGnYzoW95Hg73RqXB9omLtmqx OsmXr7y/+aGNShi/AKMAYmI5SganYE4t5RzanIEN8aBec0ADZ1SvtpYcMvu2i7gAyRsS zAJNjkrJOm4mYumD0/b7Yghi1pqzRPI4a5l94lAiiQkyXsvhaIOA8xMKpz6HCGuddm6d i8PLwMex0NPlI7YPY0t4nnzsiWrhIA+DS37VcttVNGXz+84LV1T6+XmXJW8Cz3CAI9oF YxnCMEYrn610h429pC82XBliZPNFbsb8f7owaO7cAIF9B/a/9I9gLV0vRGImkMTB7Fae y4Ag== X-Gm-Message-State: ACgBeo1sL/imx88dS0C278rDem+jMBtvUbgrwflkcJgeFUra7wmnuzk/ JUCMKVZ0p7wQkxIwLOl7AxE= X-Google-Smtp-Source: AA6agR4RURqaS+6QfQ1F4KNTzZJwYOraTDIrA+8pFTToz3eEl58npz8lLtifwckBWUrDSPN3th+Aow== X-Received: by 2002:a5d:508a:0:b0:226:dea9:b15a with SMTP id a10-20020a5d508a000000b00226dea9b15amr4000457wrt.227.1661860998527; Tue, 30 Aug 2022 05:03:18 -0700 (PDT) Original-Received: from [192.168.0.215] (buscust41-118.static.cytanet.com.cy. [212.31.107.118]) by smtp.googlemail.com with ESMTPSA id f16-20020a5d58f0000000b0021e42e7c7dbsm9467575wrd.83.2022.08.30.05.03.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 30 Aug 2022 05:03:16 -0700 (PDT) Content-Language: en-US In-Reply-To: <865yia2opx.fsf@mail.linkov.net> Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=raaahh@gmail.com; helo=mail-wr1-x435.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:294335 Archived-At: On 30.08.2022 10:20, Juri Linkov wrote: > I am unfamiliar with Mercurial, but looking at > https://www.mercurial-scm.org/wiki/GitConcepts#Git.27s_staging_area > where the table says that index/staging area is not necessary in Mercurial > and suggests to use shelve instead that corresponds to Git's stash, > it would be possible to do the same with Hg as we first tried to do > with Git using stash: put changes to stash/shelve, commit and restore > the previous state. I suppose it might work, but then what happens when stashed/shelved changes start to conflict with the ones just committed? The stash can pop up with conflict markers. Maybe that's okay, I don't know.