From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: bzr repository ready? Date: Fri, 30 Jan 2009 21:24:58 +0100 Message-ID: References: <87y6xpvyz6.fsf@xemacs.org> <87zli4jcc4.fsf@workhorse.earlhome> <87vdsrjcco.fsf@workhorse.earlhome> <87fxjgb4ud.fsf_-_@red-bean.com> <87eiyy3lag.fsf@notengoamigos.org> <87bpu1451m.fsf@red-bean.com> <874ozs34c6.fsf@notengoamigos.org> <87k58nyih3.fsf@red-bean.com> <87ocxxrjnh.fsf@canonical.com> <874ozp4ld3.fsf@notengoamigos.org> <87ocxrgm4g.fsf@canonical.com> <87y6wvhxrk.fsf@notengoamigos.org> <8763jwg1j8.fsf@red-bean.com> <87y6wsd0ll.fsf@red-bean.com> 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 1233347490 4736 80.91.229.12 (30 Jan 2009 20:31:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 30 Jan 2009 20:31:30 +0000 (UTC) Cc: Juanma Barranquero , Karl Fogel , emacs-devel@gnu.org, Stefan Monnier , Eli Zaretskii , "Stephen J. Turnbull" , Jason Earl To: Karl Fogel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 30 21:32:43 2009 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1LT02d-0002V6-3T for ged-emacs-devel@m.gmane.org; Fri, 30 Jan 2009 21:32:43 +0100 Original-Received: from localhost ([127.0.0.1]:53947 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LT01K-0007cV-Bw for ged-emacs-devel@m.gmane.org; Fri, 30 Jan 2009 15:31:22 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LSzvH-0007zb-27 for emacs-devel@gnu.org; Fri, 30 Jan 2009 15:25:07 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LSzvF-0007wv-C9 for emacs-devel@gnu.org; Fri, 30 Jan 2009 15:25:06 -0500 Original-Received: from [199.232.76.173] (port=60046 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LSzvF-0007wS-2o for emacs-devel@gnu.org; Fri, 30 Jan 2009 15:25:05 -0500 Original-Received: from cantor.suse.de ([195.135.220.2]:44706 helo=mx1.suse.de) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LSzvA-0002Fy-Vg; Fri, 30 Jan 2009 15:25:01 -0500 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 07D6744BB3; Fri, 30 Jan 2009 21:24:59 +0100 (CET) X-Yow: Yow! Are we wet yet? In-Reply-To: <87y6wsd0ll.fsf@red-bean.com> (Karl Fogel's message of "Fri, 30 Jan 2009 15:01:58 -0500") User-Agent: Gnus/5.110009 (No Gnus v0.9) Emacs/22.3 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:108423 Archived-At: Karl Fogel writes: > Thanks. So if I understand you correctly, we shouldn't worry about tha= t > commit not showing up in the bzr history. It was omitted (from git) > because the original changes themselves are already present via the > merge parent, and including the merge of that parent as a commit unto > itself wouldn't add any information. The change is not omitted, it is part of the merge commit. It is just not displayed when listing the changes in the file, since the merge commit itself did not contribute anything new to it. Technically, a merge commit is nothing more than a commit with more than one parent. It does not change anything on the state of the associated tree when the other parents are omitted. > (Reading http://www.kernel.org/pub/software/scm/git/docs/user-manual.ht= ml > to make sure I grok this completely... So in the merge of the lexbind > branch and the master branch, the lexbind branch is parent 1 and the > master branch is parent 2?) The first parent is always the commit on the same branch, the other parents (there can be more than two) are the commits from the merged branches. 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."