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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Jay Soffian <jaysoffian@xxxxxxxxx> writes:

> On Wed, Mar 16, 2011 at 8:39 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
>> As a part of my today's merge, I used 'next' that contains b2c8c0a
>> (merge-recursive: When we detect we can skip an update, actually skip it,
>> 2011-02-28) to merge 'maint' into 'master' to propagate older releases up.
>>
>> It triggered a "BUG" per merged path, and I bisected this breakage down to
>> the said commit. Luckily 'master' is not contaminated with the breakage,
>> so I used it to finish today's work.
>
> 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?

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.

Thanks.




--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]