From: Elijah Newren <newren@gmail.com>
Date: Mon, 20 Sep 2010 16:06:00 GMT
Subject: Re: [PATCH 36/37] merge-recursive: Make room for directories in D/F conflicts
Message-ID: <AANLkTin0ra6JL+jbyOwfssvSxh9FB-BCnvFcR45_=ZkS@mail.gmail.com>
In-Reply-To: <4C97483D.8030605@viscovery.net>

On Mon, Sep 20, 2010 at 5:40 AM, Johannes Sixt <j.sixt@viscovery.net> wrote:
> Am 9/20/2010 10:29, schrieb Elijah Newren:
>> +      * NOTE: This function relies on the fact that entries for a
>> +      * D/F conflict will appear adjacent in the index, with the
>> +      * entries for the file appearing before entries for paths
>> +      * below the corresponding directory.
>
> I don't think that this is a generally valid assumption. There can be
> other entries in between:
>
>   this
>   this.txt
>   this/file
>
> (where your focus is on "this").

Ah, this was one of my two big remaining questions about this series
(the other being whether all the o->call_depth > 0 cases have been
fixed).  Thanks for the clarification.

Would a sort of the entries string_list using df_name_compare() give
me what I need?

Elijah