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

Re: [RFC] cherry-pick using multiple parents to implement -x

From
Jeff King <peff@peff.net>
Date
Sep 8, 2008, 01:49 UTC
Message-ID
<20080908014959.GA29129@coredump.intra.peff.net>
In-Reply-To
<20080907202202.GC8765@cuci.nl>
On Sun, Sep 07, 2008 at 10:22:02PM +0200, Stephen R. van den Berg wrote:
> >But then it will fail to find legitimate merge bases. So yes, you _can_
> 
> Will it?  Can you give me one example where it would find the wrong one?

How about the example I gave already? The first merge-base is E, but that is not correct for the merge I gave. So you propose an algorithm which will find A. But now imagine the exact some topology, but there was no cherry-pick; instead, E' is actually a merge. Wouldn't E be the right merge-base then?

And yes, of course the _content_ of the trees in E' will be different in those two cases. But the shape of the history graph will be the same, and that is the only thing that goes into finding a merge base.

-Peff
Previous: Stephen R. van den BergNext: Stephen R. van den Berg
Message 6 of 25 in “[RFC] cherry-pick using multiple parents to implement -x”
  1. Stephen R. van den BergSep 7, 2008
  2. Jeff KingSep 7, 2008
  3. Stephen R. van den BergSep 7, 2008
  4. Jeff KingSep 7, 2008
  5. Stephen R. van den BergSep 7, 2008
  6. Jeff KingSep 8, 2008
  7. Stephen R. van den BergSep 8, 2008
  8. Junio C HamanoSep 7, 2008
  9. Stephen R. van den BergSep 7, 2008
  10. Thomas RastSep 7, 2008
  11. Junio C HamanoSep 7, 2008
  12. Junio C HamanoSep 7, 2008
  13. Paolo BonziniSep 8, 2008
  14. Junio C HamanoSep 8, 2008
  15. Junio C HamanoSep 7, 2008
  16. Stephen R. van den BergSep 8, 2008
  17. Paolo BonziniSep 8, 2008
  18. Stephen R. van den BergSep 8, 2008
  19. Jakub NarebskiSep 8, 2008
  20. Paolo BonziniSep 8, 2008
  21. Shawn O. PearceSep 8, 2008
  22. Stephen R. van den BergSep 8, 2008
  23. Shawn O. PearceSep 8, 2008
  24. Stephen R. van den BergSep 9, 2008
  25. Paolo BonziniSep 8, 2008

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.