git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git vs hg commit counts?

From
MRMarti Raudsepp <marti@juffo.org>
Date
Oct 27, 2009, 01:16 UTC
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 <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
Previous: Joe PerchesNext: Joe Perches
Message 4 of 6 in “git vs hg commit counts?”
  1. Joe PerchesOct 27, 2009
  2. Junio C HamanoOct 27, 2009
  3. Joe PerchesOct 27, 2009
  4. Marti RaudseppOct 27, 2009
  5. Joe PerchesOct 27, 2009
  6. Jakub NarebskiOct 27, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.