On Mon, Sep 20, 2010 at 5:40 AM, Johannes Sixt <j.sixt@xxxxxxxxxxxxx> 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 -- 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