From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Confusing "bzr log" as result of merges Date: Sat, 21 May 2011 12:54:29 +0200 Message-ID: References: <83ipt4fqyy.fsf@gnu.org> <83fwo8fnnl.fsf@gnu.org> <83boywflzt.fsf@gnu.org> <838vu0fill.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1305975298 28667 80.91.229.12 (21 May 2011 10:54:58 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 21 May 2011 10:54: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 Sat May 21 12:54: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 1QNjpc-0004I6-Ex for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 12:54:52 +0200 Original-Received: from localhost ([::1]:36418 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNjpb-0004Xl-65 for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 06:54:51 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:50045) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNjpU-0004XS-4H for emacs-devel@gnu.org; Sat, 21 May 2011 06:54:49 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QNjpP-0004Oj-0h for emacs-devel@gnu.org; Sat, 21 May 2011 06:54:44 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.10]:56369) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNjpJ-0004OX-5r; Sat, 21 May 2011 06:54:33 -0400 Original-Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 2D9D5188B5B5; Sat, 21 May 2011 12:54:30 +0200 (CEST) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id 267EA1C000A3; Sat, 21 May 2011 12:54:30 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.8.164]) (amavisd-new, port 10024) with ESMTP id y256qDtCjnIe; Sat, 21 May 2011 12:54:29 +0200 (CEST) Original-Received: from igel.home (ppp-88-217-118-52.dynamic.mnet-online.de [88.217.118.52]) by mail.mnet-online.de (Postfix) with ESMTP; Sat, 21 May 2011 12:54:29 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 501) id 35548CA29C; Sat, 21 May 2011 12:54:29 +0200 (CEST) X-Yow: Now my EMOTIONAL RESOURCES are heavily committed to 23% of the SMELTING and REFINING industry of the state of NEVADA!! In-Reply-To: <838vu0fill.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 21 May 2011 13:33:58 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 212.18.0.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:139584 Archived-At: Eli Zaretskii writes: > There's nothing to report. Bzr has no problem with this, either. If > there is any problem, it's how we do merges. No, you are mistaken. The merges are correct. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."