From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.bugs Subject: bug#2676: 23.0.91; annoying/unnecessary vc-next-action conflict in vc-dir buffer Date: Tue, 17 Mar 2009 10:10:18 +0900 Message-ID: References: <87iqmbcx27.fsf@catnip.gol.com> <200903151453.n2FErEpe017505@godzilla.ics.uci.edu> <200903170100.n2H10Ec4011190@godzilla.ics.uci.edu> Reply-To: Miles Bader , 2676@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1237253099 21224 80.91.229.12 (17 Mar 2009 01:24:59 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 17 Mar 2009 01:24:59 +0000 (UTC) Cc: 2676@emacsbugs.donarmstrong.com To: Dan Nicolaescu Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Mar 17 02:26:15 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 1LjO4M-0005TS-VV for geb-bug-gnu-emacs@m.gmane.org; Tue, 17 Mar 2009 02:26:15 +0100 Original-Received: from localhost ([127.0.0.1]:33349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LjO30-0007OT-MK for geb-bug-gnu-emacs@m.gmane.org; Mon, 16 Mar 2009 21:24:50 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LjO23-0006nH-IG for bug-gnu-emacs@gnu.org; Mon, 16 Mar 2009 21:23:51 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LjO1y-0006kP-5A for bug-gnu-emacs@gnu.org; Mon, 16 Mar 2009 21:23:50 -0400 Original-Received: from [199.232.76.173] (port=44002 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LjO1x-0006kH-OK for bug-gnu-emacs@gnu.org; Mon, 16 Mar 2009 21:23:45 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:57008) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LjO1w-0004X2-NP for bug-gnu-emacs@gnu.org; Mon, 16 Mar 2009 21:23: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 n2H1NgHI012190; Mon, 16 Mar 2009 18:23:43 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id n2H1F5J1010005; Mon, 16 Mar 2009 18:15:05 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Miles Bader Original-Sender: snogglethorpe@gmail.com Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs , owner@emacsbugs.donarmstrong.com Resent-Date: Tue, 17 Mar 2009 01:15:05 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: followup 2676 X-Emacs-PR-Package: emacs,vc-dir X-Emacs-PR-Keywords: Original-Received: via spool by 2676-submit@emacsbugs.donarmstrong.com id=B2676.12372522279742 (code B ref 2676); Tue, 17 Mar 2009 01:15:05 +0000 Original-Received: (at 2676) by emacsbugs.donarmstrong.com; 17 Mar 2009 01:10:27 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-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 Original-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= Original-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> X-Google-Sender-Auth: 47275d2776ac994e X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Resent-Date: Mon, 16 Mar 2009 21:23:50 -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:26412 Archived-At: 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.