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

Re: [RFC/PATCH] Make --full-history consider more merges

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 25, 2013, 16:51 UTC
Message-ID
<7vtxmu4kq2.fsf@alter.siamese.dyndns.org>
In-Reply-To
<5179505F.2000108@bracey.fi>
Kevin Bracey <kevin@bracey.fi> writes:
Show 15 quoted lines
> On 25/04/2013 04:59, Junio C Hamano wrote:
>> Junio C Hamano <gitster@pobox.com> writes:
>>
>>>> So, given all that, revised patch below:
>> I tried to squeeze the minimum test I sent $gmane/220919 to the test
>> suite.  I think the "do not use --parents option for this test"
>> switch needs to be cleaned up a bit more, but it fails without your
>> patch and does pass with your patch.
>>
>> I somehow was hoping that your fix to TREESAME semantics would also
>> correct the known breakage documented in that test, but it seems
>> that I was too greedy ;-)
> Thanks for the test addition. Maybe we will be able to satisfy your
> greed in this series. There could be more worth doing here, and I
> think getting TREESAME precise is key.

It is perfectly fine to do things one step at a time. Let's get the --full-history change into a good shape first and worry about the more complex case after we are done.

Previous: Kevin BraceyNext: Kevin Bracey
Message 10 of 25 in “Locating merge that dropped a change”
  1. Kevin BraceyApr 9, 2013
  2. Kevin BraceyApr 11, 2013
  3. Junio C HamanoApr 11, 2013
  4. Make --full-history consider more mergesKevin Bracey, Apr 22, 2013
  5. Junio C HamanoApr 22, 2013
  6. Kevin BraceyApr 23, 2013
  7. Junio C HamanoApr 24, 2013
  8. Junio C HamanoApr 25, 2013
  9. Kevin BraceyApr 25, 2013
  10. Junio C HamanoApr 25, 2013
  11. Kevin BraceyApr 25, 2013
  12. Junio C HamanoApr 25, 2013
  13. Kevin BraceyApr 26, 2013
  14. 1/3 revision.c: tighten up TREESAME handling of mergesKevin Bracey, Apr 26, 2013
  15. 2/3 simplify-merges: never remove all TREESAME parentsKevin Bracey, Apr 26, 2013
  16. Junio C HamanoApr 27, 2013
  17. Kevin BraceyApr 28, 2013
  18. Junio C HamanoApr 28, 2013
  19. 3/3 simplify-merges: drop merge from irrelevant side branchKevin Bracey, Apr 26, 2013
  20. Junio C HamanoApr 27, 2013
  21. David AguilarApr 27, 2013
  22. Kevin BraceyApr 28, 2013
  23. Junio C HamanoApr 28, 2013
  24. Kevin BraceyApr 29, 2013
  25. Junio C HamanoApr 29, 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.