Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751522AbZJ0EO1 (ORCPT ); Tue, 27 Oct 2009 00:14:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750845AbZJ0EO0 (ORCPT ); Tue, 27 Oct 2009 00:14:26 -0400 Received: from mail.perches.com ([173.55.12.10]:1091 "EHLO mail.perches.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750816AbZJ0EOZ (ORCPT ); Tue, 27 Oct 2009 00:14:25 -0400 Subject: Re: git vs hg commit counts? From: Joe Perches To: Marti Raudsepp Cc: Junio C Hamano , LKML , git , mercurial@selenic.com In-Reply-To: <54b33ccd0910261816x3c49d4ccr60a80a88dd4cfac9@mail.gmail.com> References: <1256602127.29938.8.camel@Joe-Laptop.home> <7v8wexd6zq.fsf@alter.siamese.dyndns.org> <54b33ccd0910261816x3c49d4ccr60a80a88dd4cfac9@mail.gmail.com> Content-Type: text/plain; charset="UTF-8" Date: Mon, 26 Oct 2009 21:14:29 -0700 Message-ID: <1256616869.29938.30.camel@Joe-Laptop.home> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1067 Lines: 25 On Tue, 2009-10-27 at 03:16 +0200, Marti Raudsepp wrote: > On Tue, Oct 27, 2009 at 2:18 AM, Junio C Hamano wrote: > > We simplify a merge history by discarding one branch when the merge result > > matches one of the parents. Does "hg" know how to do that as well? > > 57 of the differing changesets are normal merges (probably what Junio explained) > 3 are duplicate changesets in hg, probably also related to that > 27 changesets are octopus merge fixups > > wrt octopus merges: in git, one merge commit can have an arbitrary > number of parents, but in hg a merge changeset always has 2 parents -- > so a octopus merge is represented as multiple distinct changesets. Thanks. For hg support in get_maintainers, it's probably simplest to ignore the delta in number of commits as "close enough". -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/