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

Re: libreoffice merge issue ...

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 16, 2011, 21:30 UTC
Message-ID
<7vfwrnis50.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20110216025726.GC7085@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 10 quoted lines
>> Thanks; I was wondering about this myself but you bisected it faster.
>> 
>> Will revert.
>
> One other thing I noticed during the bisect: when using a version of git
> containing 83c9031, the merge took a lot longer. As in, 13 seconds with
> v1.7.3 versus 69 seconds with master.
>
> That may simply be because the bug being demonstrated causes us to
> erroneously do more file-level merging than we would otherwise need to.

Yeah, the reverted 83c9031 (unpack_trees(): skip trees that are the same in all input, 2010-12-22) also seems to have seriously broken intermediate merge merge-recursive makes. I actually recall scratching my head when I made 00e6ee7 (Merge branch 'maint', 2011-02-11) that was causing add/add conflict when it shouldn't. It turns out that quite a lot of entries were missing in contrib/ area from the virtual common ancestry tree synthesized by merge-recursive that called into the botched unpack_trees()---it of course would result in add/add conflict if a merge is done using such a tree as the common.

No, I haven't had a chance nor energy to dig further than what I reported above.

Previous: Jeff KingNext: Damien Wyart
Message 8 of 10 in “libreoffice merge issue ...”
  1. Michael MeeksFeb 14, 2011
  2. Norbert ThiebaudFeb 14, 2011
  3. Ferry HubertsFeb 14, 2011
  4. Norbert ThiebaudFeb 14, 2011
  5. Jeff KingFeb 15, 2011
  6. Junio C HamanoFeb 15, 2011
  7. Jeff KingFeb 16, 2011
  8. Junio C HamanoFeb 16, 2011
  9. Damien WyartApr 21, 2011
  10. Jeff KingApr 29, 2011

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.