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: Confusing "bzr log" as result of merges
Date: Sat, 21 May 2011 13:33:58 +0300
Message-ID: <838vu0fill.fsf@gnu.org>
References: <83ipt4fqyy.fsf@gnu.org> <m2d3jca1qu.fsf@linux-m68k.org>
	<83fwo8fnnl.fsf@gnu.org> <m28vu0a0kg.fsf@linux-m68k.org>
	<83boywflzt.fsf@gnu.org> <m21uzs9ywh.fsf@linux-m68k.org>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: lo.gmane.org
X-Trace: dough.gmane.org 1305974046 22679 80.91.229.12 (21 May 2011 10:34:06 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Sat, 21 May 2011 10:34:06 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Andreas Schwab <schwab@linux-m68k.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 21 12:34:02 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 ([140.186.70.17])
	by lo.gmane.org with esmtp (Exim 4.69)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1QNjVS-0004WA-7A
	for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 12:34:02 +0200
Original-Received: from localhost ([::1]:52550 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1QNjVR-00007e-A8
	for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 06:34:01 -0400
Original-Received: from eggs.gnu.org ([140.186.70.92]:47184)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1QNjVN-00007N-UT
	for emacs-devel@gnu.org; Sat, 21 May 2011 06:33:58 -0400
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1QNjVM-0001i1-Q6
	for emacs-devel@gnu.org; Sat, 21 May 2011 06:33:57 -0400
Original-Received: from mtaout22.012.net.il ([80.179.55.172]:46681)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
	id 1QNjVM-0001hx-Hx
	for emacs-devel@gnu.org; Sat, 21 May 2011 06:33:56 -0400
Original-Received: from conversion-daemon.a-mtaout22.012.net.il by
	a-mtaout22.012.net.il (HyperSendmail v2007.08) id
	<0LLJ00800JWH7800@a-mtaout22.012.net.il> for
	emacs-devel@gnu.org; Sat, 21 May 2011 13:33:54 +0300 (IDT)
Original-Received: from HOME-C4E4A596F7 ([77.124.254.13]) by a-mtaout22.012.net.il
	(HyperSendmail v2007.08) with ESMTPA id
	<0LLJ007I0K0HYU50@a-mtaout22.012.net.il>;
	Sat, 21 May 2011 13:33:54 +0300 (IDT)
In-reply-to: <m21uzs9ywh.fsf@linux-m68k.org>
X-012-Sender: halo1@inter.net.il
X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta)
X-Received-From: 80.179.55.172
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: </archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.devel:139582
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/139582>

> From: Andreas Schwab <schwab@linux-m68k.org>
> Cc: emacs-devel@gnu.org
> Date: Sat, 21 May 2011 11:38:22 +0200
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> > I know that.  The question is how to get the best of both worlds.  If
> > you have constructive ideas, I'm all ears.
> 
> Report it to the bzr people.  Git has no problem with this.

Useless advice, as usual.

There's nothing to report.  Bzr has no problem with this, either.  If
there is any problem, it's how we do merges.