From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Confusing "bzr log" as result of merges Date: Mon, 23 May 2011 09:02:37 -0300 Message-ID: References: <83ipt4fqyy.fsf@gnu.org> <83lixyejbv.fsf@gnu.org> <83ipt2dssn.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1306152178 14343 80.91.229.12 (23 May 2011 12:02:58 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 23 May 2011 12:02:58 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon May 23 14:02:54 2011 Return-path: 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 ) id 1QOTqV-0002TY-Ri for ged-emacs-devel@m.gmane.org; Mon, 23 May 2011 14:02:52 +0200 Original-Received: from localhost ([::1]:44026 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOTqS-0005Xn-Bp for ged-emacs-devel@m.gmane.org; Mon, 23 May 2011 08:02:48 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:52756) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOTqM-0005Xf-7C for emacs-devel@gnu.org; Mon, 23 May 2011 08:02:46 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QOTqL-0004zR-A6 for emacs-devel@gnu.org; Mon, 23 May 2011 08:02:42 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]:50341) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOTqL-0004zN-8p for emacs-devel@gnu.org; Mon, 23 May 2011 08:02:41 -0400 Original-Received: from 213-159-126-200.fibertel.com.ar ([200.126.159.213]:56535 helo=ceviche.home) by fencepost.gnu.org with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1QOTqK-0006Fe-Ov; Mon, 23 May 2011 08:02:41 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 218EB66371; Mon, 23 May 2011 09:02:37 -0300 (ART) In-Reply-To: <83ipt2dssn.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 23 May 2011 06:01:12 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.10 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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:139639 Archived-At: >> > 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". Merging with bzrmerge.el instead of with "bzr merge" should result in an absolutely identical result, except for the fact that the guy doing the merge will have to do a bit less work. Stefan