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: Sun, 22 May 2011 16:15:45 -0300 Message-ID: References: <83ipt4fqyy.fsf@gnu.org> <83lixyejbv.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1306091781 32385 80.91.229.12 (22 May 2011 19:16:21 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 22 May 2011 19:16:21 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun May 22 21:16:16 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 1QOE8I-00088L-Lm for ged-emacs-devel@m.gmane.org; Sun, 22 May 2011 21:16:10 +0200 Original-Received: from localhost ([::1]:46180 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOE8H-00087b-R5 for ged-emacs-devel@m.gmane.org; Sun, 22 May 2011 15:16:09 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:33964) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOE8F-00087W-Lu for emacs-devel@gnu.org; Sun, 22 May 2011 15:16:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QOE8E-0007J0-Hb for emacs-devel@gnu.org; Sun, 22 May 2011 15:16:07 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]:34189) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOE8E-0007Iw-Eq for emacs-devel@gnu.org; Sun, 22 May 2011 15:16:06 -0400 Original-Received: from [201.254.97.247] (port=58254 helo=ceviche.home) by fencepost.gnu.org with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1QOE8C-0004cL-Ma; Sun, 22 May 2011 15:16:05 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 9EA5F66371; Sun, 22 May 2011 16:15:45 -0300 (ART) In-Reply-To: <83lixyejbv.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 22 May 2011 20:28:04 +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:139629 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". Stefan