From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.bugs,gmane.emacs.pretest.bugs Subject: bug#2676: 23.0.91; annoying/unnecessary vc-next-action conflict in vc-dir buffer Date: Sun, 15 Mar 2009 11:57:36 +0900 Message-ID: <87iqmbcx27.fsf@catnip.gol.com> Reply-To: Miles Bader , 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 1237087444 2558 80.91.229.12 (15 Mar 2009 03:24:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 15 Mar 2009 03:24:04 +0000 (UTC) To: emacs-pretest-bug@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Mar 15 04:25:20 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 1LigyV-0002XJ-Tj for geb-bug-gnu-emacs@m.gmane.org; Sun, 15 Mar 2009 04:25:20 +0100 Original-Received: from localhost ([127.0.0.1]:60474 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ligx9-0002TV-BP for geb-bug-gnu-emacs@m.gmane.org; Sat, 14 Mar 2009 23:23:55 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ligx3-0002QK-KE for bug-gnu-emacs@gnu.org; Sat, 14 Mar 2009 23:23:49 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ligwy-0002G6-Tm for bug-gnu-emacs@gnu.org; Sat, 14 Mar 2009 23:23:49 -0400 Original-Received: from [199.232.76.173] (port=58604 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ligwy-0002Fr-PU for bug-gnu-emacs@gnu.org; Sat, 14 Mar 2009 23:23:44 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:57368) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Ligwx-0002Ce-S2 for bug-gnu-emacs@gnu.org; Sat, 14 Mar 2009 23:23: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 n2F3NgoL021450; Sat, 14 Mar 2009 20:23:42 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id n2F356vf016548; Sat, 14 Mar 2009 20:05:06 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Miles Bader Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Sun, 15 Mar 2009 03:05:05 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: report 2676 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by submit@emacsbugs.donarmstrong.com id=B.123708586614250 (code B ref -1); Sun, 15 Mar 2009 03:05:05 +0000 Original-Received: (at submit) by emacsbugs.donarmstrong.com; 15 Mar 2009 02:57:46 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2F2vgb8014242 for ; Sat, 14 Mar 2009 19:57:44 -0700 Original-Received: from mx10.gnu.org ([199.232.76.166]:49193) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1LigXl-0000xY-4a for emacs-pretest-bug@gnu.org; Sat, 14 Mar 2009 22:57:41 -0400 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1LigXk-000825-BS for emacs-pretest-bug@gnu.org; Sat, 14 Mar 2009 22:57:41 -0400 Original-Received: from smtp11.dentaku.gol.com ([203.216.5.73]:33321) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LigXj-00081h-D1; Sat, 14 Mar 2009 22:57:40 -0400 Original-Received: from 218.231.175.8.eo.eaccess.ne.jp ([218.231.175.8] helo=catnip.gol.com) by smtp11.dentaku.gol.com with esmtpa (Dentaku) id 1LigXh-0001Hq-3U; Sun, 15 Mar 2009 11:57:37 +0900 Original-Received: by catnip.gol.com (Postfix, from userid 1000) id 2227CDFD8; Sun, 15 Mar 2009 11:57:36 +0900 (JST) System-Type: x86_64-unknown-linux-gnu Original-Lines: 121 X-Virus-Scanned: ClamAV GOL (outbound) X-Abuse-Complaints: abuse@gol.com X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Resent-Date: Sat, 14 Mar 2009 23:23: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:26334 gmane.emacs.pretest.bugs:24126 Archived-At: [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.] Thanks, -Miles If Emacs crashed, and you have the Emacs process in the gdb debugger, please include the output from the following gdb commands: `bt full' and `xbacktrace'. If you would like to further debug the crash, please read the file /usr/local/share/emacs/23.0.91/etc/DEBUG for instructions. In GNU Emacs 23.0.91.11 (x86_64-unknown-linux-gnu, GTK+ Version 2.15.5) of 2009-03-13 on catnip Windowing system distributor `The X.Org Foundation', version 11.0.10599902 Important settings: value of $LC_ALL: nil value of $LC_COLLATE: nil value of $LC_CTYPE: nil value of $LC_MESSAGES: nil value of $LC_MONETARY: nil value of $LC_NUMERIC: nil value of $LC_TIME: nil value of $LANG: ja_JP.UTF-8 value of $XMODIFIERS: @im=SCIM locale-coding-system: utf-8-unix default-enable-multibyte-characters: t Major mode: VC dir Minor modes in effect: diff-auto-refine-mode: t shell-dirtrack-mode: t rcirc-track-minor-mode: t tooltip-mode: t mouse-wheel-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t global-auto-composition-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t Recent input: C-p SPC n o t SPC e v e r y SPC u s e r SPC w i l l SPC r e a l i z e SPC t h a t h h k n h k n o w SPC a b o u t SPC t h a t SPC c o m m a n d SPC ( ( o r SPC k n o w SPC t o SPC u s e SPC i t , SPC e s h C-a M-f M-f C-n C-e C-p C-e ) . ] C-n C-a C-k C-k C-n C-n C-x b C-x d < C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n SPC SPC SPC C-n C-a C-n C-u C-p C-u C-p C-u C-p C-u C-p C-u C-p C-e C-b SPC , SPC a n s SPC i t SPC o n l y SPC f a f h h r e l a t e s SPC t o SPC t h e SPC f i n a l SPC c o m m i t . C-a M-f M-f M-d C-e C-c C-c C-n C-n C-n C-n C-n C-n C-n x C-x C-v p l SPC o i SPC h ? p p SPC C-o C-o m n o r r r r r e C-x C-s C-x k C-u C-p C-u C-p v C-x b * s e SPC b u SPC h * r b u SPC C-x b x r e p o r SPC e m SPC Recent messages: Appended to /home/miles/mail/out/20090315 Sending...done xding [2 times] Making completion list... Saving file /tmp/zonk/ppling... Wrote /tmp/zonk/ppling xding [2 times] vc-dir-deduce-fileset: /tmp/zonk/ppling:edited clashes with /tmp/zonk/newf4:unregistered xding Scanning for dabbrevs...100% -- Fast, small, soon; pick any 2.