From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Mon, 25 Jan 2010 13:43:28 +0100 Message-ID: <87tyua1hjj.fsf@telefonica.net> References: <83vdeq634g.fsf@gnu.org> <83sk9u5wes.fsf@gnu.org> <83r5pe5vdr.fsf@gnu.org> <83my025tmb.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264424899 7808 80.91.229.12 (25 Jan 2010 13:08:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 13:08:19 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 13:44:09 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 1NZOIb-0003ao-28 for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 13:44:09 +0100 Original-Received: from localhost ([127.0.0.1]:59068 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZOIc-0001cr-1Y for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 07:44:10 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZOIX-0001c1-6F for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:44:05 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZOIS-0001aj-IK for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:44:04 -0500 Original-Received: from [199.232.76.173] (port=59053 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZOIS-0001af-BQ for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:44:00 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:51093) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZOIR-0006Ln-Tb for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:44:00 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NZOIM-0003Xl-WD for emacs-devel@gnu.org; Mon, 25 Jan 2010 13:43:55 +0100 Original-Received: from 92.red-88-24-231.staticip.rima-tde.net ([88.24.231.92]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 25 Jan 2010 13:43:54 +0100 Original-Received: from ofv by 92.red-88-24-231.staticip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 25 Jan 2010 13:43:54 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 17 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 92.red-88-24-231.staticip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) Cancel-Lock: sha1:2a4n6W4mYfsXcr/0PAvsETvevkU= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) 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:120363 Andreas Schwab writes: > Eli Zaretskii writes: > >> The one you mention was part of what I showed. This one, to be >> precise: >> >> 99266.1.22: Katsumi Yamaoka 2010-01-21 [merge] Merge from mainline. >> >> It has no deeper revisions, so I really don't see your point. > > This revision is merging trunk into a branch, exactly the same what > mhershberger@intrahealth.org-20100125045226-kdr44qlmgp2sfofu did. That revision had no effect on the output of `bzr log'. No revisions that previously were visible as trunk's mainline became magically hidden as merged history.