From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Glenn Morris <rgm@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: some bzrmerge.el questions
Date: Fri, 14 Jan 2011 14:00:04 -0500
Message-ID: <hr1v4fgvkb.fsf@fencepost.gnu.org>
References: <1e7he81r9l.fsf@fencepost.gnu.org>
	<jwvoc7kcwvp.fsf-monnier+emacs@gnu.org>
	<hcd3o0t0ud.fsf@fencepost.gnu.org> <nc7he7q4n6.fsf@fencepost.gnu.org>
	<E1PdnTU-0004yw-JO@fencepost.gnu.org>
	<r2r5cfcrdk.fsf@fencepost.gnu.org>
NNTP-Posting-Host: lo.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Trace: dough.gmane.org 1295031886 5548 80.91.229.12 (14 Jan 2011 19:04:46 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Fri, 14 Jan 2011 19:04:46 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Eli Zaretskii <eliz@gnu.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 14 20:04:42 2011
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
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 <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1Pdowx-0005kf-0C
	for ged-emacs-devel@m.gmane.org; Fri, 14 Jan 2011 20:04:39 +0100
Original-Received: from localhost ([127.0.0.1]:58194 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1Pdosl-0004Bu-2b
	for ged-emacs-devel@m.gmane.org; Fri, 14 Jan 2011 14:00:19 -0500
Original-Received: from [140.186.70.92] (port=57664 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Pdosc-000484-91
	for emacs-devel@gnu.org; Fri, 14 Jan 2011 14:00:11 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <rgm@gnu.org>) id 1Pdosb-0005SN-9X
	for emacs-devel@gnu.org; Fri, 14 Jan 2011 14:00:10 -0500
Original-Received: from fencepost.gnu.org ([140.186.70.10]:35875)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <rgm@gnu.org>)
	id 1Pdosb-0005SJ-86
	for emacs-devel@gnu.org; Fri, 14 Jan 2011 14:00:09 -0500
Original-Received: from localhost ([127.0.0.1]:56920)
	by fencepost.gnu.org with esmtp (Exim 4.69)
	(envelope-from <rgm@gnu.org>)
	id 1PdosX-00044Y-35; Fri, 14 Jan 2011 14:00:05 -0500
X-Spook: Downing Street 9705 Samford Road Fedayeen afsatcom SCUD
X-Ran: A&q0|V}\PJNsYn*0nWnBPE?F{VdY/6iaZ;"5V"[e8$e<&.wI*zB\jm'~o<_K+THUa\azws
X-Hue: blue
X-Attribution: GM
In-Reply-To: <r2r5cfcrdk.fsf@fencepost.gnu.org> (Glenn Morris's message of
	"Fri\, 14 Jan 2011 12\:44\:07 -0500")
User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
X-detected-operating-system: by eggs.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." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=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:134540
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/134540>


>>> Actually, it looks like there is a workaround.
>>
>> Which is?...

Or indeed just use rm + bzr resolve, as pointed out on the Bazaar
mailing list. Wish I'd known about that yesterday. :(