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: Mon, 23 May 2011 06:01:12 +0300
Message-ID: <83ipt2dssn.fsf@gnu.org>
References: <83ipt4fqyy.fsf@gnu.org> <jwv1uzqvnbf.fsf-monnier+emacs@gnu.org>
	<83lixyejbv.fsf@gnu.org> <jwvsjs6sg32.fsf-monnier+emacs@gnu.org>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: lo.gmane.org
X-Trace: dough.gmane.org 1306119677 1205 80.91.229.12 (23 May 2011 03:01:17 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Mon, 23 May 2011 03:01:17 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Stefan Monnier <monnier@iro.umontreal.ca>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon May 23 05:01:13 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 1QOLOK-00046A-O4
	for ged-emacs-devel@m.gmane.org; Mon, 23 May 2011 05:01:12 +0200
Original-Received: from localhost ([::1]:38287 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 1QOLOK-0001Hf-9D
	for ged-emacs-devel@m.gmane.org; Sun, 22 May 2011 23:01:12 -0400
Original-Received: from eggs.gnu.org ([140.186.70.92]:38155)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1QOLOH-0001HZ-T8
	for emacs-devel@gnu.org; Sun, 22 May 2011 23:01:10 -0400
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1QOLOG-0007Nc-Pl
	for emacs-devel@gnu.org; Sun, 22 May 2011 23:01:09 -0400
Original-Received: from mtaout20.012.net.il ([80.179.55.166]:40771)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
	id 1QOLOG-0007NW-Hx
	for emacs-devel@gnu.org; Sun, 22 May 2011 23:01:08 -0400
Original-Received: from conversion-daemon.a-mtaout20.012.net.il by
	a-mtaout20.012.net.il (HyperSendmail v2007.08) id
	<0LLM00A00OD7C300@a-mtaout20.012.net.il> for
	emacs-devel@gnu.org; Mon, 23 May 2011 06:01:06 +0300 (IDT)
Original-Received: from HOME-C4E4A596F7 ([77.124.254.13]) by a-mtaout20.012.net.il
	(HyperSendmail v2007.08) with ESMTPA id
	<0LLM0086BODTPJX0@a-mtaout20.012.net.il>;
	Mon, 23 May 2011 06:01:06 +0300 (IDT)
In-reply-to: <jwvsjs6sg32.fsf-monnier+emacs@gnu.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.166
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:139635
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/139635>

> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Cc: emacs-devel@gnu.org
> Date: Sun, 22 May 2011 16:15:45 -0300
> 
> > tool.  The discrepancy here happens because bzrmerge.el plays unholy
> > games with the metadata as opposed to the sources.  If we need to do
> 
> You are confused: the metadata resulting from bzrmerge.el is 100%
> identical to the metadata resulting from "bzr merge".

I don't think I'm confused that much: I said "metadata as opposed to
the sources".