Thread (3 messages) flat view 3 messages, 2 authors, 2016-06-15

Re: [BUG] merge-recursive triggered "BUG"

From: Jay Soffian <hidden>
Date: 2016-06-15 22:51:17

On Fri, May 20, 2011 at 8:29 AM, Jay Soffian [off-list ref] wrote:
On Thu, May 19, 2011 at 11:21 PM, Junio C Hamano [off-list ref] wrote:
quoted
quoted
I just ran into this. It's not in a repo I can share however. But, why
did b2c8c0a make it into master with this known issue?
Because it was patched by another band-aid, and apparently it was not
enough?
Okay, I didn't see the band-aid, but I didn't look very hard.
quoted
You are the second person to report the same regression, so let's revert
the merge of the entire topic, ac9666f (Merge branch 'en/merge-recursive',
2011-04-28) from master for now.
I went to confirm the cause, did a merge with v1.7.4-rc0~102
(106e3afa6f) and did not see the "addinfo_cache failed" message. But
now here's the strange part, I then switched back to master
(11bc3e92bf), tried the merge again, and I'm still not seeing the
"addinfo_cache failed" message.

So now I'm trying to figure out what v1.7.4-rc0~102 altered about the
state of my repo that I'm no longer seeing the message.
Sorry, it's definitely that topic. I didn't realize you'd already
reverted it from master. The bug occurs between when the topic was
merged and when it was reverted.

Thanks,

j.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help