From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.devel Subject: Re: No commit in vc? Date: Thu, 04 Feb 2010 23:12:56 -0500 Message-ID: <87vdec48xj.fsf@stupidchicken.com> References: <4B613BFB.2000107@swipnet.se> <87bpgev5bk.fsf@telefonica.net> <4B618AA4.1040403@swipnet.se> <87vdemtk4g.fsf@telefonica.net> <837hr23wrs.fsf@gnu.org> <87eilat62r.fsf@telefonica.net> <83eilat4g7.fsf@gnu.org> <873a1qt32z.fsf@telefonica.net> <83aavyt0bt.fsf@gnu.org> <201001290200.o0T200xh010567@godzilla.ics.uci.edu> <83y6jhs2b6.fsf@gnu.org> <201001290940.o0T9e0br025585@godzilla.ics.uci.edu> <87r5p9rxun.fsf@telefonica.net> <83vdelrx60.fsf@gnu.org> <201001291729.o0THTFam010863@godzilla.ics.uci.edu> <87ljfgdatj.fsf@telefonica.net> <83d40ssn0g.fsf@gnu.org> <201001301949.o0UJnBmA002547@godzilla.ics.uci.edu> <87ockbi4js.fsf@mail.jurta.org> <87ljfb5k7v.fsf@mail.jurta.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1265365950 17093 80.91.229.12 (5 Feb 2010 10:32:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 5 Feb 2010 10:32:30 +0000 (UTC) Cc: =?utf-8?Q?=C3=93scar?= Fuentes , Eli Zaretskii , Dan Nicolaescu , emacs-devel@gnu.org To: Juri Linkov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Feb 05 11:32:26 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1NdLTs-00034y-L5 for ged-emacs-devel@m.gmane.org; Fri, 05 Feb 2010 11:32:08 +0100 Original-Received: from localhost ([127.0.0.1]:39179 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NdFZA-0008WH-C4 for ged-emacs-devel@m.gmane.org; Thu, 04 Feb 2010 23:13:12 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NdFZ4-0008WC-F4 for emacs-devel@gnu.org; Thu, 04 Feb 2010 23:13:06 -0500 Original-Received: from [199.232.76.173] (port=56072 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NdFZ3-0008W4-43 for emacs-devel@gnu.org; Thu, 04 Feb 2010 23:13:05 -0500 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NdFZ2-0001oq-3F for emacs-devel@gnu.org; Thu, 04 Feb 2010 23:13:05 -0500 Original-Received: from pantheon-po35.its.yale.edu ([130.132.50.83]:37877) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NdFZ1-0001oh-Rp; Thu, 04 Feb 2010 23:13:03 -0500 Original-Received: from furry (bb116-15-9-83.singnet.com.sg [116.15.9.83]) (authenticated bits=0) by pantheon-po35.its.yale.edu (8.12.11.20060308/8.12.11) with ESMTP id o154Cw7L017583 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 4 Feb 2010 23:13:00 -0500 Original-Received: by furry (Postfix, from userid 1000) id D3921C05D; Thu, 4 Feb 2010 23:12:56 -0500 (EST) In-Reply-To: <87ljfb5k7v.fsf@mail.jurta.org> (Juri Linkov's message of "Wed, 03 Feb 2010 00:47:00 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.92 (gnu/linux) X-YaleITSMailFilter: Version 1.2c (attachment(s) not renamed) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:120929 Archived-At: Juri Linkov writes: >>> (when pending-merge >>> (concat >>> (propertize "Warning : " 'face 'font-lock-warning-face >>> 'help-echo shelve-help-echo) >>> (propertize "Pending merges, commit recommended before any other action" > > This warning is permanent and displayed even when there are no pending > merges regardless whether the branch is lightweight or bound heavyweight. > It seems .bzr/checkout/merge-hashes contains some old information from > previous merges. I am seeing this useless "warning" popping up every single time I use VC-dir, on the bound heavyweight branch on which I work. Unless there is a way to detect if a branch is bound and disable this warning, I think the change should be reverted.