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 15:13:20 +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 1205504090 12944 80.91.229.12 (14 Mar 2008 14:14:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 14 Mar 2008 14:14:50 +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 15:15:15 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 1JaAgk-00082E-C4 for gcvbg-bazaar-ng@m.gmane.org; Fri, 14 Mar 2008 15:15:14 +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 1JaAg9-0004rm-PS; Fri, 14 Mar 2008 14:14:37 +0000 Original-Received: from imag.imag.fr ([129.88.30.1]) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1JaAg7-0004rc-P7 for bazaar@lists.canonical.com; Fri, 14 Mar 2008 14:14:35 +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 m2EEDK8Q003025 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Fri, 14 Mar 2008 15:13:20 +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 1JaAeu-0001af-9T; Fri, 14 Mar 2008 15:13:20 +0100 Original-Received: from moy by bauges.imag.fr with local (Exim 4.63) (envelope-from ) id 1JaAeu-0001oT-6o; Fri, 14 Mar 2008 15:13:20 +0100 In-Reply-To: (Andreas Schwab's message of "Fri\, 14 Mar 2008 14\:32\:35 +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 15:13:21 +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:38573 gmane.emacs.devel:92553 Archived-At: Andreas Schwab writes: > I don't understand what "trying to figure out that ... were merged" > means. If there is a merge commit git just shows it as such. "git log" gives you a flat view. When it encounters a merge commit, it displays it, and the shows you the two (or more) branches merged by that commit more or less concatenated together. IOW, a revision that were brought in your branch by a merge and a revision that you commited by yourself in the branch is shown in the same way in git. 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). Merged revisions are shown indented below the merge commit which brought them here. That's a real difference in the way git and bzr deal with the history DAG, not just about "log". For example, git merge defaults to fast-forward (i.e. if you merge a revision you are a direct ancestor of, you just jump to that revision without creating a new commit).