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: broken bzr history? Date: Sun, 28 Feb 2010 23:55:29 -0500 Message-ID: References: <201002260126.o1Q1Q6uq008127@memory-leak.sm.sony.co.jp> <871vg89yve.fsf@mail.jurta.org> <87y6ig5mww.fsf_-_@mail.jurta.org> <26mxysx3bq.fsf_-_@fencepost.gnu.org> <87iq9gdbpm.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1267419347 19888 80.91.229.12 (1 Mar 2010 04:55:47 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 1 Mar 2010 04:55:47 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?iso-8859-1?Q?=D3scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 01 05:55:43 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.69) (envelope-from ) id 1NlxfO-0000L4-2k for ged-emacs-devel@m.gmane.org; Mon, 01 Mar 2010 05:55:38 +0100 Original-Received: from localhost ([127.0.0.1]:53751 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NlxfN-0001tc-BJ for ged-emacs-devel@m.gmane.org; Sun, 28 Feb 2010 23:55:37 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NlxfI-0001sr-CB for emacs-devel@gnu.org; Sun, 28 Feb 2010 23:55:32 -0500 Original-Received: from [140.186.70.92] (port=35931 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NlxfH-0001sj-JJ for emacs-devel@gnu.org; Sun, 28 Feb 2010 23:55:31 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NlxfG-0003FX-Te for emacs-devel@gnu.org; Sun, 28 Feb 2010 23:55:31 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:26096 helo=ironport2-out.pppoe.ca) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NlxfG-0003FR-Pw for emacs-devel@gnu.org; Sun, 28 Feb 2010 23:55:30 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvsEAOrXiktMCrTT/2dsb2JhbACbFXS5T4R7BIMXh3E X-IronPort-AV: E=Sophos;i="4.49,557,1262581200"; d="scan'208";a="57040810" Original-Received: from 76-10-180-211.dsl.teksavvy.com (HELO ceviche.home) ([76.10.180.211]) by ironport2-out.pppoe.ca with ESMTP; 28 Feb 2010 23:55:29 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id 6E611B4212; Sun, 28 Feb 2010 23:55:29 -0500 (EST) In-Reply-To: <87iq9gdbpm.fsf@telefonica.net> (=?iso-8859-1?Q?=22=D3scar?= Fuentes"'s message of "Mon, 01 Mar 2010 03:20:37 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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:121486 Archived-At: > Stefan, how did you create that merge revision? IIRC it was something like: bzr merge [... inspect bzr diff to make sure there's nothing left unmerged ...] bzr revert . bzr commit -m In any case, it was a stupid idea on my part, and I'm "glad" to see that I'll get to regret it some more in the future. Stefan