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: broken bzr history? Date: Mon, 01 Mar 2010 07:03:03 +0100 Message-ID: <87eik4d1ew.fsf@telefonica.net> 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 1267423412 28044 80.91.229.12 (1 Mar 2010 06:03:32 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 1 Mar 2010 06:03:32 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 01 07:03:28 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 1Nlyj2-0003PJ-6V for ged-emacs-devel@m.gmane.org; Mon, 01 Mar 2010 07:03:28 +0100 Original-Received: from localhost ([127.0.0.1]:53591 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nlyj1-0005Gl-EX for ged-emacs-devel@m.gmane.org; Mon, 01 Mar 2010 01:03:27 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nlyit-0005Fn-IA for emacs-devel@gnu.org; Mon, 01 Mar 2010 01:03:19 -0500 Original-Received: from [140.186.70.92] (port=35456 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nlyis-0005FD-7m for emacs-devel@gnu.org; Mon, 01 Mar 2010 01:03:18 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nlyir-0000k1-5v for emacs-devel@gnu.org; Mon, 01 Mar 2010 01:03:18 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:44367) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nlyiq-0000jj-Uw for emacs-devel@gnu.org; Mon, 01 Mar 2010 01:03:17 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1Nlyip-0003Lg-7x for emacs-devel@gnu.org; Mon, 01 Mar 2010 07:03:15 +0100 Original-Received: from 83.37.167.71 ([83.37.167.71]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 01 Mar 2010 07:03:15 +0100 Original-Received: from ofv by 83.37.167.71 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 01 Mar 2010 07:03:15 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 17 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 83.37.167.71 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.93 (gnu/linux) Cancel-Lock: sha1:nKqcH9Yh17hC+iQJjWiOKu2PvEc= X-detected-operating-system: by eggs.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:121488 Archived-At: Stefan Monnier writes: >> 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. Well, that method was what I used while migrating some svn repos to bzr, after the bzr developers sanctioned it. I guess that they are not aware of the effects on `annotate'.