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.bugs Subject: bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes Date: Tue, 20 Dec 2022 02:53:28 +0200 Message-ID: <4513ac99-76d1-cdd6-fcc9-59208b5002f3@yandex.ru> References: <38d4d719-8f3c-9bb6-b141-f7e9ca66333c@yandex.ru> <871qovjabq.fsf@melete.silentflame.com> 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="6062"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Cc: 60126@debbugs.gnu.org, juri@linkov.net To: Sean Whitton Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Dec 20 01:54:24 2022 Return-path: Envelope-to: geb-bug-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 1p7Qtk-0001RT-5c for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 20 Dec 2022 01:54:24 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7QtR-0007im-CU; Mon, 19 Dec 2022 19:54:05 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p7QtP-0007iF-5k for bug-gnu-emacs@gnu.org; Mon, 19 Dec 2022 19:54:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7QtO-00044m-UD for bug-gnu-emacs@gnu.org; Mon, 19 Dec 2022 19:54:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7QtO-0001BK-3J for bug-gnu-emacs@gnu.org; Mon, 19 Dec 2022 19:54:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 20 Dec 2022 00:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60126 X-GNU-PR-Package: emacs Original-Received: via spool by 60126-submit@debbugs.gnu.org id=B60126.16714976214534 (code B ref 60126); Tue, 20 Dec 2022 00:54:02 +0000 Original-Received: (at 60126) by debbugs.gnu.org; 20 Dec 2022 00:53:41 +0000 Original-Received: from localhost ([127.0.0.1]:41366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Qt3-0001B4-Gh for submit@debbugs.gnu.org; Mon, 19 Dec 2022 19:53:41 -0500 Original-Received: from mail-wr1-f46.google.com ([209.85.221.46]:44977) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Qsz-0001Ax-KL for 60126@debbugs.gnu.org; Mon, 19 Dec 2022 19:53:39 -0500 Original-Received: by mail-wr1-f46.google.com with SMTP id a17so9162403wrt.11 for <60126@debbugs.gnu.org>; Mon, 19 Dec 2022 16:53:37 -0800 (PST) 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:subject:date:message-id:reply-to; bh=z82fZLCGi66c+b1miW7PLVBO7Y2Kd9Vo8YmcQN/DJ+w=; b=TtG6nF6d/PeN8hEf9hqK85FQPSmvKgudDgB9Io22U7VlWXQ+YsIa4edK4qDiYSIL3R FGg3T2lS785Gowh2aW1MSEZpCWHoNqCG9JSSyeFEe2lqq+Xg/z3sEJuFJOeGZMVFGePl 2HkSl2rNR+s1ggT6CaJjoH8ZPgDWGVwESaaABGAYInvjSkhct22XXnukirXNXa8GJmUx d+I/FIQ3ancQGxddrwpwu63YlGOXH4JJXqfOXsan0egYWpSeMjo0W+S8ViVRoRu0YURJ 8k+grtuH4PowPdOufrWuFNpP+gOn+2ckpmRSm37/OTTyIPtqO8Z2GHeO2iOcNg7/l1Wb x4zg== 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:subject:date:message-id :reply-to; bh=z82fZLCGi66c+b1miW7PLVBO7Y2Kd9Vo8YmcQN/DJ+w=; b=LEcDNQYv9SyCehyrypgi1vlqqf9JW8nr7Da+9Vl/kKnIJV1N/UEe7icoGhwgzl3z/u 4Wor4bRvkOfVyjRGGornJTicoK34lBtj/Yixrhwrjft40cn2TxToKKN8qw3wSO2PEkpd 2gmKzM7jkbiH2/tS+3RtMPrIZqc8IuV6Y+iIGMbIuYRZAn0raqZ8tCU9PBVtvVNRXjVq KoHr8zAVrMhxQh3HnB4nl8rzX2wsxeO0rNVrdAPmJcIoFVCFYsorSdKoTj+pjrgNWfWe e0qt9HZ/0g1kxK1QbKZ+HcoBMdmHspfVamwlEcw/j5WOdxo2TjtJIRP8sFsyl0zMNVHm 1ktg== X-Gm-Message-State: AFqh2kra26zEg2qy136MSgI7EawbSJXlGjlBfxH7o4h21a9UBBSqTCkt zyreI52Wgco6EFXVGZo0wWE= X-Google-Smtp-Source: AMrXdXsLCDKlTMKsziuNjewt1W7NSUaPXydzjV5yUglfGdChNYyPnfKUhY/pH+hM+QNX8WtqV89cvg== X-Received: by 2002:adf:f6c2:0:b0:25c:bb30:600f with SMTP id y2-20020adff6c2000000b0025cbb30600fmr184763wrp.7.1671497611491; Mon, 19 Dec 2022 16:53:31 -0800 (PST) Original-Received: from [192.168.0.2] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id bx33-20020a5d5b21000000b002420a2cdc96sm11405006wrb.70.2022.12.19.16.53.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 19 Dec 2022 16:53:30 -0800 (PST) Content-Language: en-US In-Reply-To: <871qovjabq.fsf@melete.silentflame.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:251480 Archived-At: On 20/12/2022 00:30, Sean Whitton wrote: > This is a nice suggestion. A step further would be to unconditionally > stash and unstash. Given how committing patches with C-x v v works, I > don't believe it can ever be the case that the stash is not applicable > afterwards? I'm not sure that's 100% true, given that we'll want to stage the contents of the staging area (which are supposedly represented as diffs against the last committed state), and our command, while keeping the contents of files on disk intact, moves the last commit to a new state. > If that's wrong, I'll implement what you suggest. ...but we might as well try and experiment. Worst case: the stash won't apply cleanly and the user will have to do it by hand. That would mean no big loss of information, at least.