From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Re: No commit in vc? Date: Wed, 03 Feb 2010 00:47:00 +0200 Organization: JURTA Message-ID: <87ljfb5k7v.fsf@mail.jurta.org> 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> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1265151175 31060 80.91.229.12 (2 Feb 2010 22:52:55 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 2 Feb 2010 22:52:55 +0000 (UTC) Cc: =?iso-8859-1?Q?=D3scar?= Fuentes , Eli Zaretskii , emacs-devel@gnu.org To: Dan Nicolaescu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Feb 02 23:52:49 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 1NcRc0-0001gM-GS for ged-emacs-devel@m.gmane.org; Tue, 02 Feb 2010 23:52:48 +0100 Original-Received: from localhost ([127.0.0.1]:46854 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NcRc0-0000Cr-2S for ged-emacs-devel@m.gmane.org; Tue, 02 Feb 2010 17:52:48 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NcRb9-0008Cv-2c for emacs-devel@gnu.org; Tue, 02 Feb 2010 17:51:55 -0500 Original-Received: from [199.232.76.173] (port=37736 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NcRb8-0008CR-HP for emacs-devel@gnu.org; Tue, 02 Feb 2010 17:51:54 -0500 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NcRb7-0004cm-G3 for emacs-devel@gnu.org; Tue, 02 Feb 2010 17:51:54 -0500 Original-Received: from smtp-out4.starman.ee ([85.253.0.6]:57670 helo=mx2.starman.ee) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NcRb4-0004cF-2T; Tue, 02 Feb 2010 17:51:50 -0500 X-Virus-Scanned: by Amavisd-New at mx2.starman.ee Original-Received: from mail.starman.ee (82.131.99.225.cable.starman.ee [82.131.99.225]) by mx2.starman.ee (Postfix) with ESMTP id B54253F4092; Wed, 3 Feb 2010 00:51:42 +0200 (EET) In-Reply-To: <87ockbi4js.fsf@mail.jurta.org> (Juri Linkov's message of "Sun, 31 Jan 2010 00:54:59 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.92 (x86_64-pc-linux-gnu) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:120834 Archived-At: >> (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. -- Juri Linkov http://www.jurta.org/emacs/