From: Jaime Soriano Pastor <jsorianopastor@gmail.com>
Date: Tue, 26 Aug 2014 17:22:30 GMT
Subject: Re: [PATCH 1/2] Check order when reading index
Message-ID: <CAPuZ2NGTQoKnSfeN2zte5=fqswN5PcfAULdFy9WnGWPtc2Zskg@mail.gmail.com>
In-Reply-To: <xmqqmwarjiq7.fsf@gitster.dls.corp.google.com>

On Tue, Aug 26, 2014 at 6:53 PM, Junio C Hamano <gitster@pobox.com> wrote:
>
> Yes---that is what I meant by the "virtual stuff".  Unlike resolve
> work by Daniel (around Sep 2005 $gmane/8088) that tried to use
> multiple ancestors directly in a single merge, recursive limits
> itself to repeated use of pairwise merges.

Ok, I see now. Then what about checking also in check_ce_order() that
only stage #1 can be repeated?