From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.devel Subject: Re: No commit in vc? Date: Thu, 4 Feb 2010 21:07:08 -0800 (PST) Message-ID: <201002050507.o155787n010736@godzilla.ics.uci.edu> 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> <87vdec48xj.fsf@stupidchicken.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1265365976 17297 80.91.229.12 (5 Feb 2010 10:32:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 5 Feb 2010 10:32:56 +0000 (UTC) Cc: Juri Linkov , =?utf-8?Q?=C3=93scar?= Fuentes , Eli Zaretskii , emacs-devel@gnu.org To: Chong Yidong Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Feb 05 11:32:53 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 1NdLTm-00034y-2p for ged-emacs-devel@m.gmane.org; Fri, 05 Feb 2010 11:32:02 +0100 Original-Received: from localhost ([127.0.0.1]:58635 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NdGSW-00071d-8w for ged-emacs-devel@m.gmane.org; Fri, 05 Feb 2010 00:10:24 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NdGSQ-00071G-T9 for emacs-devel@gnu.org; Fri, 05 Feb 2010 00:10:18 -0500 Original-Received: from [199.232.76.173] (port=58075 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NdGSQ-000718-Bc for emacs-devel@gnu.org; Fri, 05 Feb 2010 00:10:18 -0500 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NdGSO-0006R0-SD for emacs-devel@gnu.org; Fri, 05 Feb 2010 00:10:18 -0500 Original-Received: from colin-baker-v0.ics.uci.edu ([128.195.1.153]:57619) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NdGSO-0006D3-FJ; Fri, 05 Feb 2010 00:10:16 -0500 Original-Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by colin-baker-v0.ics.uci.edu (8.13.8/8.13.8) with ESMTP id o15578XS030740 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 4 Feb 2010 21:07:08 -0800 Original-Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id o155787n010736; Thu, 4 Feb 2010 21:07:08 -0800 (PST) In-Reply-To: <87vdec48xj.fsf@stupidchicken.com> (Chong Yidong's message of "Thu, 04 Feb 2010 23:12:56 -0500") Original-Lines: 28 X-ICS-MailScanner-Information: Please send mail to helpdesk@ics.uci.edu or more information X-ICS-MailScanner-ID: o15578XS030740 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-1.44, required 5, autolearn=disabled, ALL_TRUSTED -1.44) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) 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:120931 Archived-At: Chong Yidong writes: > 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. Sorry, I somehow missed Juri's message. It seems that this is not related to bound branches. It looks like using the existence of .bzr/checkout/merge-hashes to detect pending merges is not reliable. I'll disable this as soon as I get a chance (if nobody beats me to it). A better method to figure out the pending merge is needed, otherwise this the header is just annoying.