From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.comp.version-control.bazaar-ng.general,gmane.emacs.devel Subject: Re: Emacs Bazaar repository Date: Fri, 14 Mar 2008 16:15:49 +0100 Message-ID: References: <87skyvse7k.fsf@xmission.com> <86ejae96t4.fsf@lola.quinscape.zz> <1205505963.6404.6.camel@ganieda.vernstok.nl> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1205507766 27462 80.91.229.12 (14 Mar 2008 15:16:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 14 Mar 2008 15:16:06 +0000 (UTC) Cc: bazaar@lists.canonical.com, Eli Zaretskii , dak@gnu.org, Matthieu Moy , emacs-devel@gnu.org To: Jelmer Vernooij Original-X-From: bazaar-bounces@lists.canonical.com Fri Mar 14 16:16:33 2008 Return-path: Envelope-to: gcvbg-bazaar-ng@m.gmane.org Original-Received: from chlorine.canonical.com ([91.189.94.204]) by lo.gmane.org with esmtp (Exim 4.50) id 1JaBe4-0006rK-8O for gcvbg-bazaar-ng@m.gmane.org; Fri, 14 Mar 2008 16:16:32 +0100 Original-Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1JaBdU-0005rI-4Y; Fri, 14 Mar 2008 15:15:56 +0000 Original-Received: from ns1.suse.de ([195.135.220.2] helo=mx1.suse.de) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1JaBdO-0005qf-64 for bazaar@lists.canonical.com; Fri, 14 Mar 2008 15:15:50 +0000 Original-Received: from Relay2.suse.de (mail2.suse.de [195.135.221.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id D9DE8350AB; Fri, 14 Mar 2008 16:15:49 +0100 (CET) X-Yow: .. Now KEN and BARBIE are PERMANENTLY ADDICTED to MIND-ALTERING DRUGS.. In-Reply-To: <1205505963.6404.6.camel@ganieda.vernstok.nl> (Jelmer Vernooij's message of "Fri\, 14 Mar 2008 15\:46\:03 +0100") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.1 (gnu/linux) X-BeenThere: bazaar@lists.canonical.com X-Mailman-Version: 2.1.8 Precedence: list List-Id: bazaar discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bazaar-bounces@lists.canonical.com Errors-To: bazaar-bounces@lists.canonical.com Xref: news.gmane.org gmane.comp.version-control.bazaar-ng.general:38585 gmane.emacs.devel:92573 Archived-At: Jelmer Vernooij writes: > Am Freitag, den 14.03.2008, 15:41 +0100 schrieb Andreas Schwab: >> Matthieu Moy writes: >>=20 >> > Andreas Schwab writes: >> > >> >> Yes, "diff" is quite important as well. Unfortunately, bzr diff se= ems >> >> to have the same performance problem. >> > >> > It shouldn't be on a "normal" setup at least with a recent enough bz= r. >> > Git is obviously faster, but for example, on an emacs tree, "bzr dif= f" >> > takes 0.3 seconds, while Git takes 0.05. So, the time taken by bzr i= s >> > acceptable to me. >>=20 >> What is the fastest way to get the difference of a revision relative t= o >> its ancestor? > if you mean its left hand side ancestor:=20 The test repo we are looking at does not have any merges yet. How would a display of a merge commit look like? > bzr diff -c This is what I was refering to above. Andreas. --=20 Andreas Schwab, SuSE Labs, schwab@suse.de SuSE Linux Products GmbH, Maxfeldstra=DFe 5, 90409 N=FCrnberg, Germany PGP key fingerprint =3D 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED= 5 "And now for something completely different."