From miles@gnu.org Sat Mar 14 19:57:46 2009 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. From dann@godzilla.ics.uci.edu Sun Mar 15 07:53:34 2009 Received: (at 2676) by emacsbugs.donarmstrong.com; 15 Mar 2009 14:53:34 +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=-6.0 required=4.0 tests=HAS_BUG_NUMBER, MURPHY_DRUGS_REL8,X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 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 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) 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) Date: Sun, 15 Mar 2009 07:53:14 -0700 (PDT) Message-Id: <200903151453.n2FErEpe017505@godzilla.ics.uci.edu> From: Dan Nicolaescu To: Miles Bader Cc: 2676@debbugs.gnu.org Subject: Re: bug#2676: 23.0.91; annoying/unnecessary vc-next-action conflict in vc-dir buffer References: <87iqmbcx27.fsf@catnip.gol.com> X-Debbugs-No-Ack: yes In-Reply-To: <87iqmbcx27.fsf@catnip.gol.com> (Miles Bader's message of "Sun, 15 Mar 2009 11:57:36 +0900") Lines: 52 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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 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. From snogglethorpe@gmail.com Sun Mar 15 17:30:39 2009 Received: (at 2676) by emacsbugs.donarmstrong.com; 16 Mar 2009 00:30:40 +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=-3.0 required=4.0 tests=HAS_BUG_NUMBER 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.30]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2G0UanB017842 for <2676@emacsbugs.donarmstrong.com>; Sun, 15 Mar 2009 17:30:38 -0700 Received: by yw-out-2324.google.com with SMTP id 5so1755319ywb.31 for <2676@emacsbugs.donarmstrong.com>; Sun, 15 Mar 2009 17:30:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:in-reply-to :references:date:x-google-sender-auth:message-id:subject:from:to:cc :content-type:content-transfer-encoding; bh=elisdG+rLcwB5p8J1DlDRSNw4jrO+wT3esQeoKMRG0k=; b=JfsCY32DaQSIZ7IDWB0QgaKd5p67h/W+JicmGo6XrmfWv/hFex0LuKfuAn7wJE2YTb 9JCyVrwyAOWbM+P+1jW2OPRue/7tpOeB0YKN4kfL4EfRlgXQDq28uorKhQYv2lyACjYJ HGXo3tSLgDyCWPla7bE2F9w2RVdPmSs2cjxcY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=tz7G+A/MMOKqu2sWi1sSPdc0/nkn8u6Vbsc1020dr4Ifw9TXfTthaQ/iOPwdpmmXs8 G+lVyLnCJX51knbqEaicnvfUrdiCU1QCEEpFuNEnKTW4YPabce7bylCIJP1h9bur+D26 WYMwJJOwECTCnfSp4gQEhfE3TOD7qr4G7u+1o= MIME-Version: 1.0 Sender: snogglethorpe@gmail.com Received: by 10.231.16.199 with SMTP id p7mr851378iba.40.1237163436255; Sun, 15 Mar 2009 17:30:36 -0700 (PDT) In-Reply-To: <200903151453.n2FErEpe017505@godzilla.ics.uci.edu> References: <87iqmbcx27.fsf@catnip.gol.com> <200903151453.n2FErEpe017505@godzilla.ics.uci.edu> Date: Mon, 16 Mar 2009 09:30:36 +0900 X-Google-Sender-Auth: 1dc578f0237aa73e Message-ID: Subject: Re: bug#2676: 23.0.91; annoying/unnecessary vc-next-action conflict in vc-dir buffer From: Miles Bader To: Dan Nicolaescu Cc: 2676@debbugs.gnu.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Sun, Mar 15, 2009 at 11:53 PM, Dan Nicolaescu wrote: > Not sure if such behavior is desirable. =A0It's not unusual to have log > files, debug output, and various other files that don't satisfy a > pattern in the current directory. =A0Registering such file and checking > them in by mistake does not seem such a good idea. Hmm, you're right, that might cause problems. Your advice about using "M" was useful, it would be cool if vc-dir could give such advice... :-) -Miles --=20 Do not taunt Happy Fun Ball. From lekktu@gmail.com Mon Mar 16 03:01:04 2009 Received: (at control) by emacsbugs.donarmstrong.com; 16 Mar 2009 10:01:04 +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=2.3 required=4.0 tests=MISSING_SUBJECT,NOSUBJECT, VALID_BTS_CONTROL autolearn=no version=3.2.5-bugs.debian.org_2005_01_02 Received: from mail-ew0-f176.google.com (mail-ew0-f176.google.com [209.85.219.176]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2GA10nD005328 for ; Mon, 16 Mar 2009 03:01:02 -0700 Received: by ewy24 with SMTP id 24so3587653ewy.1 for ; Mon, 16 Mar 2009 03:00:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type:content-transfer-encoding; bh=i6IWS3kEaldcXATEjc4+iRbM405bcENCpisDOFppCtw=; b=Hr41hZGojSatEArIZiK6b8DP19WSH9hAXKffgR6KgAJpGEukaxRUpwJ2DYKQy4tiaL Qaxj23iT5EY+IDYJQ46T5m4o4YXz7xoLVqOhFuYx9C8cf9ApPR+MptKVIZJ0EnZhm6Gi 8OwdesaKCHqzyoP8Q0uOVfsDg+AGB3msdo2WI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type :content-transfer-encoding; b=bTr3uyoFB+I4PLEOs8dBEFc59Tbb5Caeyg90qH/jwLrLsX0vZAEKYo+OA2+b6VDzSY pzBAjl2JY0En+h4GH2SmjNF9FxUNGUNButic4TKhyrI6eqTKgC/oxVCCnYIhKMMD8fec 6BqVXQCjaqlc017pT/JkNNloTxNOqSe+yF4Tg= MIME-Version: 1.0 Received: by 10.210.136.10 with SMTP id j10mr3422472ebd.24.1237197655309; Mon, 16 Mar 2009 03:00:55 -0700 (PDT) Date: Mon, 16 Mar 2009 11:00:55 +0100 Message-ID: Subject: From: Juanma Barranquero To: control@debbugs.gnu.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit reassign 2682 spam reassign 2641 emacs,vc-dir reassign 2652 emacs,vc-dir reassign 2675 emacs,vc-dir reassign 2676 emacs,vc-dir reassign 2678 emacs,vc-dir reassign 2662 emacs,ns reassign 2663 emacs,ns quit From dann@godzilla.ics.uci.edu Mon Mar 16 18:00:27 2009 Received: (at 2676) by emacsbugs.donarmstrong.com; 17 Mar 2009 01:00:27 +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=-6.0 required=4.0 tests=HAS_BUG_NUMBER, X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from sallyv2.ics.uci.edu (sallyv2.ics.uci.edu [128.195.1.120]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2H10PUx006497 for <2676@emacsbugs.donarmstrong.com>; Mon, 16 Mar 2009 18:00:26 -0700 Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by sallyv2.ics.uci.edu (8.13.7+Sun/8.13.7) with ESMTP id n2H10EKS005547; Mon, 16 Mar 2009 18:00:14 -0700 (PDT) Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id n2H10Ec4011190; Mon, 16 Mar 2009 18:00:14 -0700 (PDT) Date: Mon, 16 Mar 2009 18:00:14 -0700 (PDT) Message-Id: <200903170100.n2H10Ec4011190@godzilla.ics.uci.edu> From: Dan Nicolaescu To: Miles Bader Cc: 2676@debbugs.gnu.org Subject: Re: bug#2676: 23.0.91; annoying/unnecessary vc-next-action conflict in vc-dir buffer References: <87iqmbcx27.fsf@catnip.gol.com> <200903151453.n2FErEpe017505@godzilla.ics.uci.edu> X-Debbugs-No-Ack: yes In-Reply-To: (Miles Bader's message of "Mon, 16 Mar 2009 09:30:36 +0900") Lines: 16 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-ICS-MailScanner-Information: Please contact the ISP for more information X-ICS-MailScanner-ID: n2H10EKS005547 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 Miles Bader writes: > On Sun, Mar 15, 2009 at 11:53 PM, Dan Nicolaescu wro= te: > > Not sure if such behavior is desirable. =C2=A0It's not unusual to hav= e log > > files, debug output, and various other files that don't satisfy a > > pattern in the current directory. =C2=A0Registering such file and che= cking > > them in by mistake does not seem such a good idea. >=20 > Hmm, you're right, that might cause problems. In that case you can close this bug, right? > Your advice about using "M" was useful, it would be cool if vc-dir > could give such advice... :-) [METALIC VOICE]: This is vc-dir speaking follow everything I say! From snogglethorpe@gmail.com Mon Mar 16 18:10:27 2009 Received: (at 2676) by emacsbugs.donarmstrong.com; 17 Mar 2009 01:10:27 +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=-3.0 required=4.0 tests=HAS_BUG_NUMBER autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from mail-gx0-f177.google.com (mail-gx0-f177.google.com [209.85.217.177]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2H1AOZD009734 for <2676@emacsbugs.donarmstrong.com>; Mon, 16 Mar 2009 18:10:25 -0700 Received: by gxk25 with SMTP id 25so5512358gxk.1 for <2676@emacsbugs.donarmstrong.com>; Mon, 16 Mar 2009 18:10:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:in-reply-to :references:date:x-google-sender-auth:message-id:subject:from:to:cc :content-type:content-transfer-encoding; bh=PL1t9cV3vX6L2Z9H/GFS2WqtjcmgYcNQF4V3bsee0zo=; b=UJIEnNdRZdDj//eA8SfDky3qpTRaz5U0HsNMtJ46YOe4c0bu7GhKekHc/bGcDKgMaH SxQf8SBNYHLH/bn+hCiKvyZJtu8HfmiJMiemKDN4P5FTg/cXgPhN8wNq10pqtsSBiIum IFsCdJz34UpZT3e57OQFfQqVcHKqR208v8y7k= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=qRHYRFcwUiNJf1rIxF/IxJoqM5iF43qh6IS/JwTB5NcqYsHKnFzVOQPa9XK5iCxthJ BiQ5EpYca68gWgkRdCnhvRlfEh0UYaMXGRQXMGpgeqVMiBIHqgqO6RoZrte1KLFo2LVA LJhJF2V6ICb5Ci5cW+Svvrvd+asNlXrBSanfQ= MIME-Version: 1.0 Sender: snogglethorpe@gmail.com Received: by 10.231.14.196 with SMTP id h4mr1174967iba.15.1237252219020; Mon, 16 Mar 2009 18:10:19 -0700 (PDT) In-Reply-To: <200903170100.n2H10Ec4011190@godzilla.ics.uci.edu> References: <87iqmbcx27.fsf@catnip.gol.com> <200903151453.n2FErEpe017505@godzilla.ics.uci.edu> <200903170100.n2H10Ec4011190@godzilla.ics.uci.edu> Date: Tue, 17 Mar 2009 10:10:18 +0900 X-Google-Sender-Auth: 47275d2776ac994e Message-ID: Subject: Re: bug#2676: 23.0.91; annoying/unnecessary vc-next-action conflict in vc-dir buffer From: Miles Bader To: Dan Nicolaescu Cc: 2676@debbugs.gnu.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Tue, Mar 17, 2009 at 10:00 AM, Dan Nicolaescu wrote: > =A0> Hmm, you're right, that might cause problems. > > In that case you can close this bug, right? Can I close bugs...? > =A0> Your advice about using "M" was useful, it would be cool if vc-dir > =A0> could give such advice... :-) > > [METALIC VOICE]: This is vc-dir speaking follow everything I say! Seriously... if you've ever used git much, in some situations it gives user-oriented advice like "if you want to do foo, you might want to use comand x y z ...", and it's often a _really_ useful hint, even if you've used git for a while (and the location of such advice is tastefully chosen so that it's not annoying for experienced users). One can figure out what the current vc-next-action conflict error messages mean with a bit of thought, but they seem sort of user-hostile, almost designed to cause one's eyes to glaze over... -Miles --=20 Do not taunt Happy Fun Ball. From dann@godzilla.ics.uci.edu Mon Mar 16 19:11:36 2009 Received: (at 2676) by emacsbugs.donarmstrong.com; 17 Mar 2009 02:11:37 +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=-6.0 required=4.0 tests=HAS_BUG_NUMBER, X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from sallyv2.ics.uci.edu (sallyv2.ics.uci.edu [128.195.1.120]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2H2BY2u025114 for <2676@emacsbugs.donarmstrong.com>; Mon, 16 Mar 2009 19:11:35 -0700 Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by sallyv2.ics.uci.edu (8.13.7+Sun/8.13.7) with ESMTP id n2H29Jpv022349; Mon, 16 Mar 2009 19:09:20 -0700 (PDT) Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id n2H27n8O011708; Mon, 16 Mar 2009 19:07:49 -0700 (PDT) Date: Mon, 16 Mar 2009 19:07:49 -0700 (PDT) Message-Id: <200903170207.n2H27n8O011708@godzilla.ics.uci.edu> From: Dan Nicolaescu To: Miles Bader Cc: 2676@debbugs.gnu.org Subject: Re: bug#2676: 23.0.91; annoying/unnecessary vc-next-action conflict in vc-dir buffer References: <87iqmbcx27.fsf@catnip.gol.com> <200903151453.n2FErEpe017505@godzilla.ics.uci.edu> <200903170100.n2H10Ec4011190@godzilla.ics.uci.edu> X-Debbugs-No-Ack: yes In-Reply-To: (Miles Bader's message of "Tue, 17 Mar 2009 10:10:18 +0900") Lines: 41 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-ICS-MailScanner-Information: Please contact the ISP for more information X-ICS-MailScanner-ID: n2H29Jpv022349 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 Miles Bader writes: > On Tue, Mar 17, 2009 at 10:00 AM, Dan Nicolaescu wro= te: > > =C2=A0> Hmm, you're right, that might cause problems. > > > > In that case you can close this bug, right? >=20 > Can I close bugs...? Send an email to 2676-done@debbugs.gnu.org and it will be closed. For doing more than that see emacs/admin/notes/bugtracker > > =C2=A0> Your advice about using "M" was useful, it would be cool if v= c-dir > > =C2=A0> could give such advice... :-) > > > > [METALIC VOICE]: This is vc-dir speaking follow everything I say! >=20 > Seriously... if you've ever used git much, in some situations it > gives user-oriented advice like "if you want to do foo, you might want > to use comand x y z ...", and it's often a _really_ useful hint, even > if you've used git for a while (and the location of such advice is > tastefully chosen so that it's not annoying for experienced users). > One can figure out what the current vc-next-action conflict error > messages mean with a bit of thought, but they seem sort of > user-hostile, almost designed to cause one's eyes to glaze over... I take responsibility for the error thrown by `vc-dir-deduce-fileset'. How about saying something like: VC operations when applied to multiple files require files to be in similar VC states. %s in state %s clashes with %s in state %s If you have suggestions for this and other messages, they shouldn't be too hard to improve. In general some facility that shows tips for various modes would be useful to have in emacs. From lekktu@gmail.com Tue Mar 17 02:22:15 2009 Received: (at control) by emacsbugs.donarmstrong.com; 17 Mar 2009 09:22:15 +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=2.3 required=4.0 tests=MISSING_SUBJECT,NOSUBJECT, VALID_BTS_CONTROL autolearn=no version=3.2.5-bugs.debian.org_2005_01_02 Received: from mail-ew0-f176.google.com (mail-ew0-f176.google.com [209.85.219.176]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2H9MCD0005523 for ; Tue, 17 Mar 2009 02:22:14 -0700 Received: by ewy24 with SMTP id 24so3991757ewy.1 for ; Tue, 17 Mar 2009 02:22:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type:content-transfer-encoding; bh=8kg3xZo7LkfeWm8/N+Bb5gCTHDvSowOAk/GT0NUKjNc=; b=sS/XKophFfzDqrpZxSKYexjpSHOEBgWFBIntADHTWgLQ7xAkX2LJay0VW5/a9alnYU JqK5mkqwrC9L2Iu+b+OHuLWMs4dh1ivw0p3TpVFe4KfkhmlI8VYyhAH9+vGdgV/V/aj8 ZjrZbQHD9z3NgdBNX9dcvrhXE1JDzicWFM4Uo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type :content-transfer-encoding; b=epHiHh4jTH8hNQ3Z9W+sdmPMWG5K8t56w3EIXDv+nyc7uMUO0OebD87ssmj47nN/8V gEn2T5weZyGT7QqOtX3mDXQokeXZQjhWmeLaUkSzN5IXPiPJhZ8VSTSKiUUROU4m5YrP Wm9HxlDTvoTR98dZx15fhqd+5ewRn1t26NJDo= MIME-Version: 1.0 Received: by 10.210.139.15 with SMTP id m15mr4357553ebd.9.1237281726835; Tue, 17 Mar 2009 02:22:06 -0700 (PDT) Date: Tue, 17 Mar 2009 10:22:06 +0100 Message-ID: Subject: From: Juanma Barranquero To: control@debbugs.gnu.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit reassign 337 emacs,vc reassign 768 emacs,vc reassign 927 emacs,vc reassign 996 emacs,vc reassign 1098 emacs,vc reassign 1163 emacs,vc reassign 1256 emacs,vc reassign 1257 emacs,vc reassign 1408 emacs,vc reassign 1429 emacs,vc reassign 1589 emacs,vc reassign 1647 emacs,w32,vc reassign 1741 emacs,vc reassign 2093 emacs,vc reassign 2110 emacs,vc reassign 2117 emacs,vc reassign 2157 emacs,vc reassign 2338 emacs,vc reassign 2553 emacs,vc reassign 2598 emacs,vc reassign 2604 emacs,vc reassign 2612 emacs,vc reassign 2641 emacs,vc reassign 2652 emacs,vc reassign 2675 emacs,vc reassign 2676 emacs,vc reassign 2678 emacs,vc quit From snogglethorpe@gmail.com Wed Mar 18 04:43:32 2009 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@debbugs.gnu.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-CrossAssassin-Score: 76 From unknown Sat Jun 14 03:48:20 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: $requester Subject: Internal Control Message-Id: bug archived. Date: Wed, 15 Apr 2009 14:24:11 +0000 User-Agent: Fakemail v42.6.9 # A New Hope # A log time ago, in a galaxy far, far away # something happened. # # Magically this resulted in the following # action being taken, but this fake control # message doesn't tell you why it happened # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator