From: Marti Raudsepp Date: Tue, 27 Oct 2009 01:16:31 GMT Subject: Re: git vs hg commit counts? Message-ID: <54b33ccd0910261816x3c49d4ccr60a80a88dd4cfac9@mail.gmail.com> In-Reply-To: <7v8wexd6zq.fsf@alter.siamese.dyndns.org> 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. Marti