From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: No commit in vc? Date: Fri, 05 Feb 2010 10:44:33 +0200 Message-ID: <83vdecf4we.fsf@gnu.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> <87ljfb5k7v.fsf@mail.jurta.org> <87vdec48xj.fsf@stupidchicken.com> <201002050507.o155787n010736@godzilla.ics.uci.edu> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: ger.gmane.org 1265365935 16978 80.91.229.12 (5 Feb 2010 10:32:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 5 Feb 2010 10:32:15 +0000 (UTC) Cc: juri@jurta.org, ofv@wanadoo.es, cyd@stupidchicken.com, emacs-devel@gnu.org To: Dan Nicolaescu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Feb 05 11:32:12 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 1NdLTN-00032G-SY for ged-emacs-devel@m.gmane.org; Fri, 05 Feb 2010 11:31:38 +0100 Original-Received: from localhost ([127.0.0.1]:46993 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NdK0C-0007G3-7y for ged-emacs-devel@m.gmane.org; Fri, 05 Feb 2010 03:57:24 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NdJnr-000275-3S for emacs-devel@gnu.org; Fri, 05 Feb 2010 03:44:40 -0500 Original-Received: from [199.232.76.173] (port=42648 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NdJnp-00026Z-0v for emacs-devel@gnu.org; Fri, 05 Feb 2010 03:44:37 -0500 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NdJnn-0008D0-Gv for emacs-devel@gnu.org; Fri, 05 Feb 2010 03:44:36 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:34659) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NdJnn-0008Cs-4S for emacs-devel@gnu.org; Fri, 05 Feb 2010 03:44:35 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0KXD00M001JTG300@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Fri, 05 Feb 2010 10:44:33 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.70.67.249]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KXD00GO71M8AFF0@a-mtaout20.012.net.il>; Fri, 05 Feb 2010 10:44:33 +0200 (IST) In-reply-to: <201002050507.o155787n010736@godzilla.ics.uci.edu> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) 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:120928 Archived-At: > Date: Thu, 4 Feb 2010 21:07:08 -0800 (PST) > From: Dan Nicolaescu > Cc: Juri Linkov , =C3=93scar Fuentes , > Eli Zaretskii , emacs-devel@gnu.org >=20 > 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). >=20 > A better method to figure out the pending merge is needed, otherwis= e > this the header is just annoying. I didn't track this thread, either, so I may be missing something: wh= y =2Ebzr/checkout/merge-hashes? I thought we agreed to use the flags displayed by "bzr status" for the fact that there are pending uncommitted merges.