From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: James Westby <jw+debian@jameswestby.net>
Newsgroups: gmane.comp.version-control.bazaar-ng.general,gmane.emacs.devel
Subject: Re: Emacs repository benchmark: bzr and git
Date: Sat, 29 Mar 2008 04:06:13 +0000
Message-ID: <1206763573.6694.114.camel@flash>
References: <20080318154316.GA6242@mithlond.arda.local>
	<47DFE4EA.5000600@gmail.com>
	<e3f230850803180905m3472e822odcc8adadf1d7e093@mail.gmail.com>
	<E1JboR1-0004vm-G5@fencepost.gnu.org>
	<d06a5cd30803261832g4785ca10q65ddda6d2ffc58a2@mail.gmail.com>
	<jwvmyoksx2c.fsf-monnier+emacs@gnu.org> <m2prtggtd6.fsf@free.fr>
	<jwvr6du7fap.fsf-monnier+emacs@gnu.org>
	<1206754223.6694.110.camel@flash>
	<jwvfxuafdkf.fsf-monnier+emacs@gnu.org>
NNTP-Posting-Host: lo.gmane.org
Mime-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
X-Trace: ger.gmane.org 1206763576 29538 80.91.229.12 (29 Mar 2008 04:06:16 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Sat, 29 Mar 2008 04:06:16 +0000 (UTC)
Cc: bazaar@lists.canonical.com, rms@gnu.org, lennart.borgman@gmail.com,
	emacs-devel@gnu.org, tlikonen@iki.fi
To: Stefan Monnier <monnier@iro.umontreal.ca>
Original-X-From: bazaar-bounces@lists.canonical.com Sat Mar 29 05:06:47 2008
Return-path: <bazaar-bounces@lists.canonical.com>
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 1JfSL7-0002xa-4n
	for gcvbg-bazaar-ng@m.gmane.org; Sat, 29 Mar 2008 05:06:45 +0100
Original-Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com)
	by chlorine.canonical.com with esmtp (Exim 4.60)
	(envelope-from <bazaar-bounces@lists.canonical.com>)
	id 1JfSKR-0004RO-G8; Sat, 29 Mar 2008 04:06:03 +0000
Original-Received: from jameswestby.net ([89.145.97.141])
	by chlorine.canonical.com with esmtp (Exim 4.60)
	(envelope-from <jw+debian@jameswestby.net>) id 1JfSKQ-0004RH-8L
	for bazaar@lists.canonical.com; Sat, 29 Mar 2008 04:06:02 +0000
Original-Received: from 77-99-12-164.cable.ubr13.azte.blueyonder.co.uk ([77.99.12.164]
	helo=[192.168.1.104])
	by jameswestby.net with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <jw+debian@jameswestby.net>)
	id 1JfSKN-0006Tc-P9; Sat, 29 Mar 2008 04:05:59 +0000
In-Reply-To: <jwvfxuafdkf.fsf-monnier+emacs@gnu.org>
X-Mailer: Evolution 2.22.0 
X-BeenThere: bazaar@lists.canonical.com
X-Mailman-Version: 2.1.8
Precedence: list
List-Id: bazaar discussion <bazaar.lists.canonical.com>
List-Unsubscribe: <https://lists.ubuntu.com/mailman/listinfo/bazaar>,
	<mailto:bazaar-request@lists.canonical.com?subject=unsubscribe>
List-Archive: <https://lists.ubuntu.com/archives/bazaar>
List-Post: <mailto:bazaar@lists.canonical.com>
List-Help: <mailto:bazaar-request@lists.canonical.com?subject=help>
List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/bazaar>,
	<mailto:bazaar-request@lists.canonical.com?subject=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:39494 gmane.emacs.devel:93752
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/93752>

On Fri, 2008-03-28 at 23:09 -0400, Stefan Monnier wrote:
> >> Anybody knows where I can find some doc about that file's format?
> 
> > bzrlib/dirstate.py
> 
> Thanks, exactly what I was looking for, although the "current tree vs
> second tree" distinction is very much unclear to me.

I *think* it's actually one or more trees. The first tree is the
left hand parent. Any other tress are the state in the other
parents, i.e. merged revisions.

Thanks,

James