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

Re: Premerging topics

From
Antoine Pelisse <apelisse@gmail.com>
Date
Apr 23, 2013, 15:17 UTC
Message-ID
<CALWbr2xAxkNMedbuS-+pPy+Zc5MEhoCWk3oW8BXS9db63DoGAg@mail.gmail.com>
In-Reply-To
<7vwqrtl2mk.fsf@alter.siamese.dyndns.org>
On Tue, Apr 23, 2013 at 4:53 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 11 quoted lines
> Johan Herland <johan@herland.net> writes:
>
>> Can you solve this problem with a tree object, instead of inventing a
>> specially-formatted blob?
>
> Hmm.  What problem are you guys trying to solve?
>
> [snipped..]
> And that was why I wanted to have a data structure that is quick to
> query to answer "I am about to merge B.  Does the history already
> have an A for which I have recorded a merge-fix for <A,B> pair?"

That's exactly the problem I'm trying to solve. I'm willing to have an efficient way to merge topicC that has semantic conflicts with topicA and topicB. As topics will be merged together first in pu, then in next and finally in master, chances are that they won't be merged in the same order (or then, why would we even care about a topic workflow?). And I have the feeling that "merge-fix/B" or "merge-fix/A" doesn't hold enough information to do that accurately.

The idea is then to store the <A, B> pair as a note, and to associate a "merge" to that (solving the semantic conflict). It would then be used as an implicit third parent for the merge of "branch containing A" and "branch containing B". This is pretty much what Michael said in the $gmane you talked about.

Cheers, Antoine

Previous: Junio C HamanoNext: Junio C Hamano
Message 14 of 16 in “Premerging topics (was: [RFD] annnotating a pair of commit objects?)”
  1. Antoine PelisseApr 10, 2013
  2. Antoine PelisseApr 22, 2013
  3. Johan HerlandApr 23, 2013
  4. Antoine PelisseApr 23, 2013
  5. Johan HerlandApr 23, 2013
  6. Junio C HamanoApr 24, 2013
  7. Johan HerlandApr 24, 2013
  8. Junio C HamanoApr 24, 2013
  9. Antoine PelisseApr 29, 2013
  10. Junio C HamanoApr 29, 2013
  11. Antoine PelisseApr 29, 2013
  12. Junio C HamanoApr 29, 2013
  13. Junio C HamanoApr 23, 2013
  14. Antoine PelisseApr 23, 2013
  15. Junio C HamanoApr 23, 2013
  16. Antoine PelisseApr 23, 2013

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.