From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes Date: Sat, 17 Dec 2022 19:06:50 +0200 Organization: LINKOV.NET Message-ID: <86sfhe2i4t.fsf@mail.linkov.net> References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="38435"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) Cc: 60126@debbugs.gnu.org, dgutov@yandex.ru To: Sean Whitton Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Dec 17 18:28:15 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 1p6ays-0009sa-Nk for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 17 Dec 2022 18:28:14 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6ayj-00019x-V3; Sat, 17 Dec 2022 12:28:06 -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 1p6ayi-00018p-Gm for bug-gnu-emacs@gnu.org; Sat, 17 Dec 2022 12:28:04 -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 1p6ayi-0001x6-93 for bug-gnu-emacs@gnu.org; Sat, 17 Dec 2022 12:28:04 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6ayi-0005ei-4o for bug-gnu-emacs@gnu.org; Sat, 17 Dec 2022 12:28:04 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 17 Dec 2022 17:28:04 +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.167129806521659 (code B ref 60126); Sat, 17 Dec 2022 17:28:04 +0000 Original-Received: (at 60126) by debbugs.gnu.org; 17 Dec 2022 17:27:45 +0000 Original-Received: from localhost ([127.0.0.1]:57026 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6ayP-0005dG-96 for submit@debbugs.gnu.org; Sat, 17 Dec 2022 12:27:45 -0500 Original-Received: from relay6-d.mail.gandi.net ([217.70.183.198]:38445) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6ayM-0005d3-Ki for 60126@debbugs.gnu.org; Sat, 17 Dec 2022 12:27:43 -0500 Original-Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id 54C08C0004; Sat, 17 Dec 2022 17:27:31 +0000 (UTC) In-Reply-To: (Sean Whitton's message of "Fri, 16 Dec 2022 18:32:54 +0000") 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:251293 Archived-At: > I seem often to end up with a nonempty index when trying to commit patches > using C-x v v from diff-mode, so I came up with this patch. >From the version 30.0.50 in the subject do I correctly infer that you propose this patch for master? In master this could be installed immediately, but for the release branch I'd prefer first to test it extensively.