From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.comp.version-control.bazaar-ng.general,gmane.emacs.devel Subject: Re: Emacs repository benchmark: bzr and git Date: Sat, 29 Mar 2008 00:50:00 -0400 Message-ID: References: <20080318154316.GA6242@mithlond.arda.local> <47DFE4EA.5000600@gmail.com> <1206754223.6694.110.camel@flash> <1206763573.6694.114.camel@flash> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1206766233 1741 80.91.229.12 (29 Mar 2008 04:50:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 29 Mar 2008 04:50:33 +0000 (UTC) Cc: bazaar@lists.canonical.com, rms@gnu.org, lennart.borgman@gmail.com, emacs-devel@gnu.org, tlikonen@iki.fi To: James Westby Original-X-From: bazaar-bounces@lists.canonical.com Sat Mar 29 05:51:03 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 1JfT1t-00021y-1y for gcvbg-bazaar-ng@m.gmane.org; Sat, 29 Mar 2008 05:50:57 +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 1JfT1H-00018T-EC; Sat, 29 Mar 2008 04:50:19 +0000 Original-Received: from 206-248-178-205.dsl.teksavvy.com ([206.248.178.205] helo=ceviche.home) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1JfT1E-00017A-QP for bazaar@lists.canonical.com; Sat, 29 Mar 2008 04:50:17 +0000 Original-Received: by ceviche.home (Postfix, from userid 20848) id 33785B40BB; Sat, 29 Mar 2008 00:50:00 -0400 (EDT) In-Reply-To: <1206763573.6694.114.camel@flash> (James Westby's message of "Sat, 29 Mar 2008 04:06:13 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (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:39497 gmane.emacs.devel:93759 Archived-At: > 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. I don't think so. The "second tree" seems to correspond to the leftmost parent. The first tree seems to correspond to something else. It's usually the same as the second, but when I did a merge, the first tree seems to describe something like the state of tree at the end of the merge command, and it dosn't have sha1 for the files with conflicts (and maybe for others as well). When merging, there are more than 2 trees (typically just 3: the "current", the "second" (i.e. leftmost parent), and some other which I guess corresponds to the other parent). Stefan