From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.bugs Subject: bug#2676: 23.0.91; annoying/unnecessary vc-next-action conflict in vc-dir buffer Date: Sun, 15 Mar 2009 07:53:14 -0700 (PDT) Message-ID: <200903151453.n2FErEpe017505@godzilla.ics.uci.edu> References: <87iqmbcx27.fsf@catnip.gol.com> Reply-To: Dan Nicolaescu , 2676@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1237129534 18738 80.91.229.12 (15 Mar 2009 15:05:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 15 Mar 2009 15:05:34 +0000 (UTC) Cc: 2676@emacsbugs.donarmstrong.com To: Miles Bader Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Mar 15 16:06:51 2009 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1LirvM-0006Lw-6v for geb-bug-gnu-emacs@m.gmane.org; Sun, 15 Mar 2009 16:06:48 +0100 Original-Received: from localhost ([127.0.0.1]:43274 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Liru0-00064t-11 for geb-bug-gnu-emacs@m.gmane.org; Sun, 15 Mar 2009 11:05:24 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LirsU-0005hv-3J for bug-gnu-emacs@gnu.org; Sun, 15 Mar 2009 11:03:50 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LirsP-0005fR-O4 for bug-gnu-emacs@gnu.org; Sun, 15 Mar 2009 11:03:49 -0400 Original-Received: from [199.232.76.173] (port=48120 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LirsP-0005fO-F1 for bug-gnu-emacs@gnu.org; Sun, 15 Mar 2009 11:03:45 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:55670) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LirsO-0003pD-9T for bug-gnu-emacs@gnu.org; Sun, 15 Mar 2009 11:03:44 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2FF3g9W018859; Sun, 15 Mar 2009 08:03:42 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id n2FF0453017658; Sun, 15 Mar 2009 08:00:04 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Dan Nicolaescu Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Sun, 15 Mar 2009 15:00:04 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: followup 2676 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 2676-submit@emacsbugs.donarmstrong.com id=B2676.123712881416034 (code B ref 2676); Sun, 15 Mar 2009 15:00:04 +0000 Original-Received: (at 2676) by emacsbugs.donarmstrong.com; 15 Mar 2009 14:53:34 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from barrelv2.ics.uci.edu (barrelv2.ics.uci.edu [128.195.1.114]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2FErVMd016017 for <2676@emacsbugs.donarmstrong.com>; Sun, 15 Mar 2009 07:53:32 -0700 Original-Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by barrelv2.ics.uci.edu (8.13.8+Sun/8.13.8) with ESMTP id n2FErEH9008566; Sun, 15 Mar 2009 07:53:14 -0700 (PDT) Original-Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id n2FErEpe017505; Sun, 15 Mar 2009 07:53:14 -0700 (PDT) In-Reply-To: <87iqmbcx27.fsf@catnip.gol.com> (Miles Bader's message of "Sun, 15 Mar 2009 11:57:36 +0900") Original-Lines: 52 X-ICS-MailScanner-Information: Please contact the ISP for more information X-ICS-MailScanner-ID: n2FErEH9008566 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.44, required 5, autolearn=disabled, ALL_TRUSTED -1.44) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Resent-Date: Sun, 15 Mar 2009 11:03:49 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:26343 Archived-At: Miles Bader writes: > [Note: I have Dan's patch for fixing whole-directory vc-dir commit in > Git applied, though I don't think it should affect the following, as it > relates to final commit.] > > If I have a vc-dir buffer showing a tree with a new file (not yet > registered with source-control), and a changed file (already > registered): > > VC backend : Git > Working dir: /tmp/zonk/ > Branch : master > > ./ > unregistered newf4 > edited ppling > > Then hitting "v" on the first line of the buffer gives the following > error: > > vc-dir-deduce-fileset: /tmp/zonk/ppling:edited clashes with /tmp/zonk/newf4:unregistered > > While I guess I understand the reason for this, it's slightly annoying. > > Given vc-next-action's "do-the-right-next-thing" functionality, it would > seem better in such a case to instead do a "register files only" step > (ignoring any changed-but-already-registered entries); subsequently, the > user could just hit "v" again to commit everything (the old changed file > and the files newly registered by the first "v"). > > I think this behavior would be a better match for vc-next-action's > behavior on single files. > > Because registering/deregistering files is typically a local and > easily reversible operation, it would be "safe". > > [Probably the "register files only" step should handle deletions too, > unregistering any deleted files.] Not sure if such behavior is desirable. It's not unusual to have log files, debug output, and various other files that don't satisfy a pattern in the current directory. Registering such file and checking them in by mistake does not seem such a good idea. Note that it's quite easy to register all unregistered files: put the cursor on one of them, press M, all of them will be selected, press v and be done. Also note that vc-dir is just enforcing the vc-next-action requirements here, so you probably want to file your bug against that one.