From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Matthieu Moy Newsgroups: gmane.comp.version-control.bazaar-ng.general,gmane.emacs.devel Subject: Re: Emacs Bazaar repository Date: Fri, 14 Mar 2008 16:43:39 +0100 Message-ID: References: <87skyvse7k.fsf@xmission.com> <86ejae96t4.fsf@lola.quinscape.zz> <47DA3601.3040507@arbash-meinel.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1205509553 1917 80.91.229.12 (14 Mar 2008 15:45:53 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 14 Mar 2008 15:45:53 +0000 (UTC) Cc: bazaar@lists.canonical.com, Eli Zaretskii , dak@gnu.org, emacs-devel@gnu.org To: Andreas Schwab Original-X-From: bazaar-bounces@lists.canonical.com Fri Mar 14 16:46:21 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 1JaC6Y-0001RO-SL for gcvbg-bazaar-ng@m.gmane.org; Fri, 14 Mar 2008 16:45:58 +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 1JaC5z-00019E-J8; Fri, 14 Mar 2008 15:45:23 +0000 Original-Received: from imag.imag.fr ([129.88.30.1]) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1JaC5w-00018d-Qn for bazaar@lists.canonical.com; Fri, 14 Mar 2008 15:45:20 +0000 Original-Received: from mail-veri.imag.fr (mail-veri.imag.fr [129.88.43.52]) by imag.imag.fr (8.13.8/8.13.8) with ESMTP id m2EFheJA019813 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Fri, 14 Mar 2008 16:43:40 +0100 (CET) Original-Received: from bauges.imag.fr ([129.88.43.5]) by mail-veri.imag.fr with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32) (Exim 4.50) id 1JaC4J-00055X-UC; Fri, 14 Mar 2008 16:43:39 +0100 Original-Received: from moy by bauges.imag.fr with local (Exim 4.63) (envelope-from ) id 1JaC4J-00023c-Rk; Fri, 14 Mar 2008 16:43:39 +0100 In-Reply-To: (Andreas Schwab's message of "Fri\, 14 Mar 2008 15\:30\:21 +0100") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (imag.imag.fr [129.88.30.1]); Fri, 14 Mar 2008 16:43:41 +0100 (CET) X-IMAG-MailScanner-Information: Please contact MI2S MIM for more information X-IMAG-MailScanner: Found to be clean X-IMAG-MailScanner-SpamCheck: X-IMAG-MailScanner-From: moy@imag.fr 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:38593 gmane.emacs.devel:92577 Archived-At: Andreas Schwab writes: > Matthieu Moy writes: > >> As opposed to that, bzr makes the distinction between "mainline >> revisions" (that you commited in the branch), and merged revisions >> (ancestors of merge commits that you brought here with a merge). > > Is that a useful distinction? It really depends on your flow. If the organization of developers forms a kind of tree, then on each branch, bzr will show the revisions in a kind of hierarchical way, like 42: Merged feature foo 41.3: bugfix in implementation of foo 41.2: added NEWS entry 41.1: implement foo 41: Merged feature bar ... ... So, you can get a global view of history following mainline revisions, and go into details when walking through merged revisions. The bzr people usually like this distinction. There are drawbacks though. One of them is that this pushes people towards a flow where the mainline is different from other branches. If you don't, then the hierarchical view of bzr will look like garbage, you'll see some "keep in sync with upstream" commits in the middle of mainline, ... People like Torvalds find this unacceptable. So, asking whether bzr does the right thing is like asking whether Emacs is better than vim. One is obviously better than the other, and everybody thinking a different way has to be plain stupid, but people still didn't agree on which is which ;-).