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: merge conlict? Date: Mon, 25 Jan 2010 13:34:23 +0100 Message-ID: References: <83vdeq634g.fsf@gnu.org> <83sk9u5wes.fsf@gnu.org> <87ljfm329g.fsf@telefonica.net> <87hbqa2zmf.fsf@telefonica.net> <87ockiflg2.fsf@mithlond.arda> <87636q2x2q.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1264424297 4634 80.91.229.12 (25 Jan 2010 12:58:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 12:58:17 +0000 (UTC) Cc: Teemu Likonen , emacs-devel@gnu.org To: =?utf-8?Q?=C3=93scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 13:34:41 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NZO9R-000898-6A for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 13:34:41 +0100 Original-Received: from localhost ([127.0.0.1]:43337 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZO9S-0005fi-5T for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 07:34:42 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZO9K-0005e9-6t for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:34:34 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZO9D-0005bR-Sx for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:34:31 -0500 Original-Received: from [199.232.76.173] (port=46999 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZO9D-0005bM-N8 for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:34:27 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:54506) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZO9D-0004qu-B4 for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:34:27 -0500 Original-Received: from mail01.m-online.net (mail.m-online.net [192.168.3.149]) by mail-out.m-online.net (Postfix) with ESMTP id 5E1D61C15463; Mon, 25 Jan 2010 13:34:25 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id 1566D900A3; Mon, 25 Jan 2010 13:34:25 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.3.149]) by localhost (dynscan1.mnet-online.de [192.168.8.164]) (amavisd-new, port 10024) with ESMTP id 52QOjxR-t7n6; Mon, 25 Jan 2010 13:34:24 +0100 (CET) Original-Received: from igel.home (DSL01.83.171.176.225.ip-pool.NEFkom.net [83.171.176.225]) by mail.mnet-online.de (Postfix) with ESMTP; Mon, 25 Jan 2010 13:34:24 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 501) id 11FE7CA298; Mon, 25 Jan 2010 13:34:24 +0100 (CET) X-Yow: RHAPSODY in Glue! In-Reply-To: <87636q2x2q.fsf@telefonica.net> (=?utf-8?Q?=22=C3=93scar?= Fuentes"'s message of "Mon, 25 Jan 2010 13:22:37 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:120359 Óscar Fuentes writes: > Unless you take the "technically" part as "no code was lost", I beg to > differ. A simple `bzr log' will show that the commits of the last few > days are gone from the listing. You need to add the `-n2' parameter to > see them as merged history under Mark's commit. That's only a UI problem. There is nothing lost in terms of history. > Oh, and apart from this problem and producing a huge diff, it breaks > bisection. How? 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."