GNU bug report logs - #6399
Confirm vc commits when the files do not match those marked in vc-dir

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.

Package: emacs; Severity: wishlist; Reported by: Glenn Morris <rgm@HIDDEN>; merged with #7675; dated Fri, 11 Jun 2010 03:51:02 UTC; Maintainer for emacs is bug-gnu-emacs@HIDDEN.
Removed tag(s) moreinfo. Request was from Lars Ingebrigtsen <larsi@HIDDEN> to control <at> debbugs.gnu.org. Full text available.
Added tag(s) moreinfo. Request was from Lars Ingebrigtsen <larsi@HIDDEN> to control <at> debbugs.gnu.org. Full text available.

Message received at 6399 <at> debbugs.gnu.org:


Received: (at 6399) by debbugs.gnu.org; 18 Jul 2021 13:10:56 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jul 18 09:10:56 2021
Received: from localhost ([127.0.0.1]:55427 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1m56ZM-00027o-Id
	for submit <at> debbugs.gnu.org; Sun, 18 Jul 2021 09:10:56 -0400
Received: from quimby.gnus.org ([95.216.78.240]:34028)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <larsi@HIDDEN>) id 1m56ZK-00027a-Sr
 for 6399 <at> debbugs.gnu.org; Sun, 18 Jul 2021 09:10:55 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org;
 s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date:
 References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding:
 Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:
 Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:
 List-Subscribe:List-Post:List-Owner:List-Archive;
 bh=vhM7nl6iYlNqSbQvK8MOvSYnojuoS5KTEU2zlhnekmI=; b=XYHFVQHrJDO/OD3bgDHxrO/4az
 S2UteCRfqhpHcTWwou4v4jhiGSzLsHePP++9JOvDEeZSMnoX3KraWAiXUglPjxenUerynAzxDuwGl
 a4ilhFJc1Es9kD4/T7M6p9HFxtkHrjwcI0prj9odXelyPTb2OHDG9sSVhyds7D/XmU1w=;
Received: from cm-84.212.220.105.getinternet.no ([84.212.220.105] helo=elva)
 by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.92) (envelope-from <larsi@HIDDEN>)
 id 1m56ZC-0000p7-8P; Sun, 18 Jul 2021 15:10:48 +0200
From: Lars Ingebrigtsen <larsi@HIDDEN>
To: Glenn Morris <rgm@HIDDEN>
Subject: Re: bug#6399: Confirm vc commits when the files do not match those
 marked in vc-dir
References: <jn8w6mz0qn.fsf@HIDDEN>
X-Now-Playing: The Meters's _Gettin' Funkier All The Time (1): Here Comes
 The Meter Man & Looka-Ya Py Py_: "Oh, Calcutta!"
Date: Sun, 18 Jul 2021 15:10:45 +0200
In-Reply-To: <jn8w6mz0qn.fsf@HIDDEN> (Glenn Morris's message of
 "Thu, 10 Jun 2010 23:50:24 -0400")
Message-ID: <87wnpnrcmi.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 @@CONTACT_ADDRESS@@ for details.
 Content preview: Glenn Morris <rgm@HIDDEN> writes: > I've made this mistake
 a few times now: > > 1) Mark say 5 files in vc-dir. > > 2) Press v to get
 a vc-log buffer. > > 3) Realize I should not have marked one of the 5 files,
 and unmark it > in the v [...] 
 Content analysis details:   (-2.9 points, 5.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -1.0 ALL_TRUSTED            Passed through trusted hosts only via SMTP
 -1.9 BAYES_00               BODY: Bayes spam probability is 0 to 1%
 [score: 0.0000]
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 6399
Cc: 6399 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

Glenn Morris <rgm@HIDDEN> writes:

> I've made this mistake a few times now:
>
> 1) Mark say 5 files in vc-dir.
>
> 2) Press v to get a vc-log buffer.
>
> 3) Realize I should not have marked one of the 5 files, and unmark it
> in the vc-dir buffer.
>
> 4) Forget to kill the existing vc-log buffer, and so end up committing
> all 5 files anyway.

Somehow that has never happened to me, so I guess it's never occurred to
me to do something like that.  But I see that the problem is still
present in Emacs 28.

> I wish that at step 4 when I try to commit, Emacs would check if the
> files about to be commited match those marked in the vc-dir buffer,
> and if not ask me to confirm the commit.

Yeah, that seems like a good idea.  I can't really imagine somebody
altering the marked files in the vc-dir buffer without wanting to affect
which files get checked in on the `C-c C-c'.  But before I start poking
at this -- would adding a query like this disrupt somebody's work flow?

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no




Information forwarded to bug-gnu-emacs@HIDDEN:
bug#6399; Package emacs. Full text available.
Added tag(s) patch. Request was from Glenn Morris <rgm@HIDDEN> to control <at> debbugs.gnu.org. Full text available.
Forcibly Merged 6399 7675. Request was from Glenn Morris <rgm@HIDDEN> to control <at> debbugs.gnu.org. Full text available.

Message received at 6399 <at> debbugs.gnu.org:


Received: (at 6399) by debbugs.gnu.org; 11 Jun 2010 05:54:02 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jun 11 01:54:02 2010
Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1OMxBp-0003Lt-Ti
	for submit <at> debbugs.gnu.org; Fri, 11 Jun 2010 01:54:02 -0400
Received: from ironport2-out.teksavvy.com ([206.248.154.181]
	helo=ironport2-out.pppoe.ca)
	by debbugs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <monnier@HIDDEN>) id 1OMxBo-0003Lh-S0
	for 6399 <at> debbugs.gnu.org; Fri, 11 Jun 2010 01:54:01 -0400
X-IronPort-Anti-Spam-Filtered: true
X-IronPort-Anti-Spam-Result: AvsEAN5rEUxMCqeQ/2dsb2JhbACeeHK9XYUYBIx6
X-IronPort-AV: E=Sophos;i="4.53,402,1272859200"; d="scan'208";a="67822084"
Received: from 76-10-167-144.dsl.teksavvy.com (HELO alfajor.home)
	([76.10.167.144])
	by ironport2-out.pppoe.ca with ESMTP; 11 Jun 2010 01:53:56 -0400
Received: by alfajor.home (Postfix, from userid 20848)
	id 41128AE008; Fri, 11 Jun 2010 01:53:56 -0400 (EDT)
From: Stefan Monnier <monnier@HIDDEN>
To: Glenn Morris <rgm@HIDDEN>
Subject: Re: bug#6399: Confirm vc commits when the files do not match those
	marked in vc-dir
Message-ID: <jwv8w6mktf5.fsf-monnier+emacs@HIDDEN>
References: <jn8w6mz0qn.fsf@HIDDEN>
Date: Fri, 11 Jun 2010 01:53:56 -0400
In-Reply-To: <jn8w6mz0qn.fsf@HIDDEN> (Glenn Morris's message of
	"Thu, 10 Jun 2010 23:50:24 -0400")
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Spam-Score: -2.2 (--)
X-Debbugs-Envelope-To: 6399
Cc: 6399 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.11
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <http://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
	<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <http://debbugs.gnu.org/pipermail/debbugs-submit>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <http://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
	<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Sender: debbugs-submit-bounces <at> debbugs.gnu.org
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
X-Spam-Score: -2.2 (--)

> I've made this mistake a few times now:

> 1) Mark say 5 files in vc-dir.

> 2) Press v to get a vc-log buffer.

> 3) Realize I should not have marked one of the 5 files, and unmark it
> in the vc-dir buffer.

> 4) Forget to kill the existing vc-log buffer, and so end up committing
> all 5 files anyway.


> I wish that at step 4 when I try to commit, Emacs would check if the
> files about to be commited match those marked in the vc-dir buffer,
> and if not ask me to confirm the commit.

Agreed.  That's what PCL-CVS does.  PCL-CVS goes one step further,
actually: if there's a discrepancy (and the user confirms that the
discrepancy is OK), it's the *cvs* (aka *vc-dir*) selection that takes
precedence over the list of files that was active when the vc-log buffer
was created.


        Stefan






Information forwarded to owner <at> debbugs.gnu.org, bug-gnu-emacs@HIDDEN:
bug#6399; Package emacs. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 11 Jun 2010 03:50:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jun 10 23:50:29 2010
Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1OMvGG-0001tk-OV
	for submit <at> debbugs.gnu.org; Thu, 10 Jun 2010 23:50:28 -0400
Received: from fencepost.gnu.org ([140.186.70.10])
	by debbugs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <rgm@HIDDEN>) id 1OMvGF-0001tf-KA
	for submit <at> debbugs.gnu.org; Thu, 10 Jun 2010 23:50:27 -0400
Received: from rgm by fencepost.gnu.org with local (Exim 4.69)
	(envelope-from <rgm@HIDDEN>)
	id 1OMvGC-0008FC-7Q; Thu, 10 Jun 2010 23:50:24 -0400
To: submit <at> debbugs.gnu.org
Subject: Confirm vc commits when the files do not match those marked in vc-dir
From: Glenn Morris <rgm@HIDDEN>
X-Spook: Khaddafi insurgency kilo class UFO SDI Kosovo clandestine
X-Ran: ~gF0&FLGDS"qM]5_A?:4,W&VwB~DLYov`ye:gIp8*anU*|H,,$4b1i,i\>Sg#VZSgVuwE(
X-Hue: red
X-Debbugs-No-Ack: yes
X-Attribution: GM
Date: Thu, 10 Jun 2010 23:50:24 -0400
Message-ID: <jn8w6mz0qn.fsf@HIDDEN>
User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Spam-Score: -6.1 (------)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.11
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <http://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
	<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <http://debbugs.gnu.org/pipermail/debbugs-submit>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <http://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
	<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Sender: debbugs-submit-bounces <at> debbugs.gnu.org
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
X-Spam-Score: -6.1 (------)

Package: emacs
Severity: wishlist

I've made this mistake a few times now:

1) Mark say 5 files in vc-dir.

2) Press v to get a vc-log buffer.

3) Realize I should not have marked one of the 5 files, and unmark it
in the vc-dir buffer.

4) Forget to kill the existing vc-log buffer, and so end up committing
all 5 files anyway.


I wish that at step 4 when I try to commit, Emacs would check if the
files about to be commited match those marked in the vc-dir buffer,
and if not ask me to confirm the commit.




Report forwarded to owner <at> debbugs.gnu.org, bug-gnu-emacs@HIDDEN:
bug#6399; Package emacs. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Mon, 16 Aug 2021 12:30:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.