| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <54b33ccd0910261816x3c49d4ccr60a80a88dd4cfac9@mail.gmail.com> Date: Tue, 27 Oct 2009 03:16:31 +0200 From: Marti Raudsepp <marti@...fo.org> To: Junio C Hamano <gitster@...ox.com> Cc: Joe Perches <joe@...ches.com>, LKML <linux-kernel@...r.kernel.org>, git <git@...r.kernel.org>, mercurial@...enic.com Subject: Re: git vs hg commit counts? On Tue, Oct 27, 2009 at 2:18 AM, Junio C Hamano <gitster@...ox.com> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists