From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: owner@emacsbugs.donarmstrong.com (Emacs bug Tracking System) Newsgroups: gmane.emacs.bugs Subject: bug#2676: marked as done (23.0.91; annoying/unnecessary vc-next-action conflict in vc-dir buffer) Date: Wed, 18 Mar 2009 11:50:03 +0000 Message-ID: References: <87iqmbcx27.fsf@catnip.gol.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----------=_1237377003-24480-0" X-Trace: ger.gmane.org 1237377914 20951 80.91.229.12 (18 Mar 2009 12:05:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 18 Mar 2009 12:05:14 +0000 (UTC) To: Miles Bader Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Mar 18 13:06:31 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 1LjuWx-0004N6-GM for geb-bug-gnu-emacs@m.gmane.org; Wed, 18 Mar 2009 13:05:58 +0100 Original-Received: from localhost ([127.0.0.1]:37069 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LjuVa-0003tM-Jt for geb-bug-gnu-emacs@m.gmane.org; Wed, 18 Mar 2009 08:04:30 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LjuV3-0003ho-G0 for bug-gnu-emacs@gnu.org; Wed, 18 Mar 2009 08:03:57 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LjuUy-0003dE-Ij for bug-gnu-emacs@gnu.org; Wed, 18 Mar 2009 08:03:57 -0400 Original-Received: from [199.232.76.173] (port=55834 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LjuUy-0003d8-A3 for bug-gnu-emacs@gnu.org; Wed, 18 Mar 2009 08:03:52 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:56009) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LjuUq-0005Db-PU; Wed, 18 Mar 2009 08:03:45 -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 n2IC3hcP028307; Wed, 18 Mar 2009 05:03:43 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id n2IBo3Tw024525; Wed, 18 Mar 2009 04:50:03 -0700 X-Mailer: MIME-tools 5.420 (Entity 5.420) X-Loop: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: closed 2676 X-Emacs-PR-Package: emacs,vc X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) 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:26460 Archived-At: This is a multi-part message in MIME format... ------------=_1237377003-24480-0 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 Your message dated Wed, 18 Mar 2009 20:43:28 +0900 with message-id and subject line close this bug... has caused the Emacs bug report #2676, regarding 23.0.91; annoying/unnecessary vc-next-action conflict in vc-dir b= uffer to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@emacsbugs.donarmstrong.com immediately.) --=20 2676: http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=3D2676 Emacs Bug Tracking System Contact owner@emacsbugs.donarmstrong.com with problems ------------=_1237377003-24480-0 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by emacsbugs.donarmstrong.com; 15 Mar 2009 02:57:46 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=0.1 required=4.0 tests=FOURLA,MURPHY_DRUGS_REL8 autolearn=no version=3.2.5-bugs.debian.org_2005_01_02 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 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 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 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 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 Received: by catnip.gol.com (Postfix, from userid 1000) id 2227CDFD8; Sun, 15 Mar 2009 11:57:36 +0900 (JST) From: Miles Bader To: emacs-pretest-bug@gnu.org Subject: 23.0.91; annoying/unnecessary vc-next-action conflict in vc-dir buffer Reply-To: Miles Bader System-Type: x86_64-unknown-linux-gnu Date: Sun, 15 Mar 2009 11:57:36 +0900 Message-ID: <87iqmbcx27.fsf@catnip.gol.com> Lines: 121 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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) [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. ------------=_1237377003-24480-0 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 2676-done) by emacsbugs.donarmstrong.com; 18 Mar 2009 11:43:32 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=0.0 required=4.0 tests=none autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from yw-out-2324.google.com (yw-out-2324.google.com [74.125.46.28]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2IBhTiR023123 for <2676-done@emacsbugs.donarmstrong.com>; Wed, 18 Mar 2009 04:43:30 -0700 Received: by yw-out-2324.google.com with SMTP id 5so4231ywh.31 for <2676-done@emacsbugs.donarmstrong.com>; Wed, 18 Mar 2009 04:43:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:date :x-google-sender-auth:message-id:subject:from:to:content-type :content-transfer-encoding; bh=47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=; b=aJi0b+rAk1JEVhu6XlRO0lXiNbLDuTwlkbaVYSUYe8MdHsM3RiVhvT9Ms2UxmU4M38 BhWj9AL7bDYRrmgi3Dd52wMwyWBrn1CQOVT0T6ikCfPTkhD5/0T/Q1BKN9rdU5gWlPGf 624A4MRk5mp4meY39IzzHiVTbAngzQ+pEbE3c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:date:x-google-sender-auth:message-id:subject :from:to:content-type:content-transfer-encoding; b=VHvRojyDNyCTN1Vu87MWMSiQhkjbrn0oileAC8xy1VMMYnQRWyCANyDihbD1Ln/KTw oZSAsqT2xKNE++c9S4MzR9QA8I0oipxac5U6lGUzTOWfLwFL0wMMqHfnbyK4gecZRzcS 4uc0z9iCm3F9bYTfelIrguKyBaDglKRUimlzY= MIME-Version: 1.0 Sender: snogglethorpe@gmail.com Received: by 10.231.15.205 with SMTP id l13mr421119iba.7.1237376608744; Wed, 18 Mar 2009 04:43:28 -0700 (PDT) Date: Wed, 18 Mar 2009 20:43:28 +0900 X-Google-Sender-Auth: e3fd744e1ce56c2b Message-ID: Subject: close this bug... From: Miles Bader To: 2676-done@emacsbugs.donarmstrong.com Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-CrossAssassin-Score: 76 ------------=_1237377003-24480-0--