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

Re: mercurial to git

From
LBLen Brown <lenb@kernel.org>
Date
Mar 16, 2007, 04:53 UTC
Message-ID
<200703160053.54699.lenb@kernel.org>
In-Reply-To
<20070315210406.GA8568@thunk.org>
On Thursday 15 March 2007 17:04, Theodore Tso wrote:
> So it does handle octopus merges already (it has to, the ACPI folks
> are very ocotpus merge happy :-).
Well, just to set the record straight...

So yes, I did a 12-way merge in the kernel a long while back on a lark. I don't generally do them any more in the official kernel tree because I think they make bisect more complicated than it needs to be.

cheers, -Len

Previous: Simon 'corecode' Schubert
Message 19 of 19 in “mercurial to git”
  1. Rocco RutteMar 6, 2007
  2. Theodore TsoMar 6, 2007
  3. Rocco RutteMar 6, 2007
  4. Josef SipekMar 6, 2007
  5. Theodore TsoMar 7, 2007
  6. Rocco RutteMar 8, 2007
  7. Shawn O. PearceMar 7, 2007
  8. Rocco RutteMar 8, 2007
  9. Shawn O. PearceMar 7, 2007
  10. Rocco RutteMar 8, 2007
  11. Theodore TsoMar 15, 2007
  12. Rocco RutteMar 15, 2007
  13. Theodore TsoMar 15, 2007
  14. Rocco RutteMar 15, 2007
  15. Linus TorvaldsMar 15, 2007
  16. Theodore TsoMar 15, 2007
  17. Rocco RutteMar 15, 2007
  18. Simon 'corecode' SchubertMar 17, 2007
  19. Len BrownMar 16, 2007

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.