From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: git apologia Date: Sun, 16 Nov 2014 20:38:21 +0200 Message-ID: <83ppcnc7oi.fsf@gnu.org> References: <20141114183737.GB3168@acm.acm> <5466517B.50705@porkrind.org> <20141114215404.GD3168@acm.acm> <838ujchods.fsf@gnu.org> <8761egx1k2.fsf@uwakimon.sk.tsukuba.ac.jp> <83sihkg2ds.fsf@gnu.org> <87vbmgv3b9.fsf@uwakimon.sk.tsukuba.ac.jp> <83389jdtae.fsf@gnu.org> <87y4rbw19i.fsf@igel.home> <83vbmfc99m.fsf@gnu.org> <87ppcnvwfw.fsf@igel.home> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416163135 13616 80.91.229.3 (16 Nov 2014 18:38:55 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Nov 2014 18:38:55 +0000 (UTC) Cc: stephen@xemacs.org, emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 16 19:38:47 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Xq4il-0000X3-IO for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 19:38:47 +0100 Original-Received: from localhost ([::1]:44732 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq4il-0006kV-6D for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 13:38:47 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43200) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq4ie-0006en-3b for emacs-devel@gnu.org; Sun, 16 Nov 2014 13:38:44 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xq4iY-0006ly-Be for emacs-devel@gnu.org; Sun, 16 Nov 2014 13:38:40 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:59894) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq4iY-0006lu-3s for emacs-devel@gnu.org; Sun, 16 Nov 2014 13:38:34 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NF500000A8NSJ00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Sun, 16 Nov 2014 20:38:32 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF50000ZAG8HI60@a-mtaout22.012.net.il>; Sun, 16 Nov 2014 20:38:32 +0200 (IST) In-reply-to: <87ppcnvwfw.fsf@igel.home> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177340 Archived-At: > From: Andreas Schwab > Cc: stephen@xemacs.org, emacs-devel@gnu.org > Date: Sun, 16 Nov 2014 19:20:51 +0100 > > Eli Zaretskii writes: > > > No, bzr shows the merge-commit on the mainline, with a normal > > (i.e. non-dotted) number. Only the commits on the branch from which > > we merged are skipped by default by "bzr log". > > And how is that different from the counting of HEAD~n? The merge-commits don't show using HEAD~n. Here's an example. With the current trunk, the 10th and 11th entries shown by "git log" are for merge-commits made by Stefan. But if I type git show HEAD~10 I see the 12th commit, the one by Oscar. And HEAD~9 is the one before the two Stefan's commits. By contrast, with bzr I do see merge-commits as if they were mainline commits: bzr log -c-12 118349: Glenn Morris 2014-11-10 [merge] Merge from emacs-24; up to 117702 Am I doing something wrong?