From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Sean Whitton Newsgroups: gmane.emacs.bugs Subject: bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes Date: Sat, 17 Dec 2022 17:20:03 -0700 Message-ID: <87mt7lwojw.fsf@melete.silentflame.com> References: <86sfhe2i4t.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="29088"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 60126@debbugs.gnu.org, dgutov@yandex.ru To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Dec 18 01:21:18 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 1p6hQb-0007Kt-7Y for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 18 Dec 2022 01:21:17 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6hQS-0004xQ-U0; Sat, 17 Dec 2022 19:21:08 -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 1p6hQN-0004xC-Rk for bug-gnu-emacs@gnu.org; Sat, 17 Dec 2022 19:21: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 1p6hQN-0003w2-8r for bug-gnu-emacs@gnu.org; Sat, 17 Dec 2022 19:21:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6hQM-0003pr-Gw for bug-gnu-emacs@gnu.org; Sat, 17 Dec 2022 19:21:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 18 Dec 2022 00:21: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.167132281314704 (code B ref 60126); Sun, 18 Dec 2022 00:21:02 +0000 Original-Received: (at 60126) by debbugs.gnu.org; 18 Dec 2022 00:20:13 +0000 Original-Received: from localhost ([127.0.0.1]:58796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6hPY-0003p6-NZ for submit@debbugs.gnu.org; Sat, 17 Dec 2022 19:20:13 -0500 Original-Received: from out4-smtp.messagingengine.com ([66.111.4.28]:39225) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6hPX-0003ow-G7 for 60126@debbugs.gnu.org; Sat, 17 Dec 2022 19:20:12 -0500 Original-Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 4C0475C00B0; Sat, 17 Dec 2022 19:20:06 -0500 (EST) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sat, 17 Dec 2022 19:20:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=spwhitton.name; h=cc:cc:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1671322806; x=1671409206; bh=IR 2xM+72hbYTxNDsCL7CDYaui3HSKi7ceG2gIOWJx+A=; b=ispna4dC35RD5k2yS2 ZstrY7tjMDMHPI+3aNy2e6bsHm1cvh4XlgYSR24scwMiJLEAIx7r6Fp/lhOjC2So jr+7tKM5nbVCJBSgvL40Km03TE338pE5cTWn5O5RqOGLupM8EWTh+qE55kcXsYK2 WfZGh6dBKg/q9Cmhy/i4N7VBNch+vdaNowxnx7pwroUkJnGa2i6Yb2YcaYfYt+xd raIhpnvPcp5bs960jUAq1v2dsXkIJVpqp5raGrwwE/eWjqkfPGPTZtQZr9vlDRuc Xgk1+VP+b6PHnRqT7OgCka21iVz4ELSUkHbulQRHs4EIRrW69d1wM+YpyRdaEKSn okfQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1671322806; x=1671409206; bh=IR2xM+72hbYTxNDsCL7CDYaui3HS Ki7ceG2gIOWJx+A=; b=sa6KbHY+1AIPkFFyDrjR7BvVUlxk7U2JPnejsYdUiJ+Y 5kZt1CZlpG4kGPyW3RplofGKNpB5va3ZtKEj1+RZxGFkMUgAb7l6eCn/lJqk0cru UivjZTOr93QHP2ZLgBxM/BDoFmhQWiXtxYnn3DGQCOd1KxUPN7I9z0URSOltqsJW UFiUdh8hPu+oEIuzoOMeHUArB8Pl04VidyNIqoFBvY+oAqMNroDslIqDP7FYlI0d HtZVYj9NQeWl3pSd5Zlz8KFe1s5b97eHlH4NMOeXGf3A2iljIfgAAmK4VpvwFrdm XPMmDe6CT8oc5feQksLBP+j2R+F/Tfzv9f8oW73h0w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrgedtgddulecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufgjfhffkfgfgggtsehttddttddtredtnecuhfhrohhmpefuvggrnhcu hghhihhtthhonhcuoehsphifhhhithhtohhnsehsphifhhhithhtohhnrdhnrghmvgeqne cuggftrfgrthhtvghrnheptdffvdffueeluedvteekvdevhefghedvgeevgffhvedukeeg geelveegjeekteeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhepshhpfihhihhtthhonhesshhpfihhihhtthhonhdrnhgrmhgv X-ME-Proxy: Feedback-ID: i23c04076:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 17 Dec 2022 19:20:05 -0500 (EST) Original-Received: by melete.silentflame.com (Postfix, from userid 1000) id 035057EE3CA; Sat, 17 Dec 2022 17:20:04 -0700 (MST) In-Reply-To: <86sfhe2i4t.fsf@mail.linkov.net> (Juri Linkov's message of "Sat, 17 Dec 2022 19:06:50 +0200") 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:251323 Archived-At: Hello, On Sat 17 Dec 2022 at 07:06PM +02, Juri Linkov wrote: >> 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. Yes. It's a new feature, so I don't see how it could go on the release branch? -- Sean Whitton