From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: some bzrmerge.el questions
Date: Fri, 14 Jan 2011 12:30:08 -0500
Message-ID: <E1PdnTU-0004yw-JO@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>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: lo.gmane.org
X-Trace: dough.gmane.org 1295026234 7542 80.91.229.12 (14 Jan 2011 17:30:34 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Fri, 14 Jan 2011 17:30:34 +0000 (UTC)
Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org
To: Glenn Morris <rgm@gnu.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 14 18:30:30 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 1PdnTn-00018H-2A
	for ged-emacs-devel@m.gmane.org; Fri, 14 Jan 2011 18:30:27 +0100
Original-Received: from localhost ([127.0.0.1]:44176 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1PdnTm-0001As-CC
	for ged-emacs-devel@m.gmane.org; Fri, 14 Jan 2011 12:30:26 -0500
Original-Received: from [140.186.70.92] (port=48653 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PdnTa-00018C-GR
	for emacs-devel@gnu.org; Fri, 14 Jan 2011 12:30:15 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1PdnTZ-0000SN-8l
	for emacs-devel@gnu.org; Fri, 14 Jan 2011 12:30:14 -0500
Original-Received: from fencepost.gnu.org ([140.186.70.10]:60515)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
	id 1PdnTZ-0000SI-5r
	for emacs-devel@gnu.org; Fri, 14 Jan 2011 12:30:13 -0500
Original-Received: from eliz by fencepost.gnu.org with local (Exim 4.69)
	(envelope-from <eliz@gnu.org>)
	id 1PdnTU-0004yw-JO; Fri, 14 Jan 2011 12:30:08 -0500
In-reply-to: <nc7he7q4n6.fsf@fencepost.gnu.org> (message from Glenn Morris on
	Fri, 14 Jan 2011 03:19:09 -0500)
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:134534
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/134534>

> From: Glenn Morris <rgm@gnu.org>
> Date: Fri, 14 Jan 2011 03:19:09 -0500
> Cc: emacs-devel@gnu.org
> 
> Glenn Morris wrote:
> 
> > https://bugs.launchpad.net/bzr/+bug/660935/
> 
> Actually, it looks like there is a workaround.

Which is?...

I was about to write that if the problem is that bad (and being unable
to merge from emacs-23 _is_ bad), we could ask Bazaar developers to
give this bug high priority and provide us with some workaround.  But
if you already found one, that could be good enough.