From: Damien Wyart <damien.wyart@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: libreoffice merge issue ...
Date: Thu, 21 Apr 2011 16:01:32 +0200 [thread overview]
Message-ID: <20110421140132.GA6696@brouette> (raw)
In-Reply-To: <7vfwrnis50.fsf@alter.siamese.dyndns.org>
Hi,
Sorry to wake up an old thread.
* Junio C Hamano <gitster@pobox.com> [2011-02-16 13:30]:
> 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.
Out of curiosity, I would like to know if digging further into this
issue is still on your TODO list. I feel understanding exactly what was
wrong in 83c9031 would be interesting ; having just the revert is a bit
frustrating.
The initial optimization in 83c9031 seemed right at first glance, so
I would be interesting in having a more final answer to this.
Many thanks in advance,
--
Damien Wyart
next prev parent reply other threads:[~2011-04-21 14:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-14 16:07 libreoffice merge issue Michael Meeks
2011-02-14 16:52 ` Norbert Thiebaud
2011-02-14 17:26 ` Ferry Huberts
2011-02-14 17:33 ` Norbert Thiebaud
2011-02-15 9:45 ` Jeff King
2011-02-15 18:46 ` Junio C Hamano
2011-02-16 2:57 ` Jeff King
2011-02-16 21:30 ` Junio C Hamano
2011-04-21 14:01 ` Damien Wyart [this message]
2011-04-29 12:55 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110421140132.GA6696@brouette \
--to=damien.wyart@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.