From: Marti Raudsepp <marti@juffo.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Joe Perches <joe@perches.com>,
LKML <linux-kernel@vger.kernel.org>, git <git@vger.kernel.org>,
mercurial@selenic.com
Subject: Re: git vs hg commit counts?
Date: Tue, 27 Oct 2009 03:16:31 +0200 [thread overview]
Message-ID: <54b33ccd0910261816x3c49d4ccr60a80a88dd4cfac9@mail.gmail.com> (raw)
In-Reply-To: <7v8wexd6zq.fsf@alter.siamese.dyndns.org>
On Tue, Oct 27, 2009 at 2:18 AM, Junio C Hamano <gitster@pobox.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
next prev parent reply other threads:[~2009-10-27 1:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-27 0:08 Joe Perches
2009-10-27 0:18 ` Junio C Hamano
2009-10-27 0:23 ` Joe Perches
2009-10-27 1:16 ` Marti Raudsepp [this message]
2009-10-27 4:14 ` Joe Perches
2009-10-27 1:14 ` Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54b33ccd0910261816x3c49d4ccr60a80a88dd4cfac9@mail.gmail.com \
--to=marti@juffo.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mercurial@selenic.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®