Re: [PATCH 01/10] merge-ort: handle D/F conflict where directory disappears due to merge

From: Derrick Stolee <stolee@gmail.com>
Date: Dec 31, 2020, 11:17 UTC
Message-ID: <41ac7d44-e32b-99ed-c928-6325a02ba62c@gmail.com>
In-Reply-To: <CABPp-BFrct6hZW8bh5hhRpGSPhjeGO9viCjpO02gUyTqNnrAgg@mail.gmail.com>

On 12/30/2020 10:13 AM, Elijah Newren wrote:

Show 18 quoted lines

> On Wed, Dec 30, 2020 at 6:06 AM Derrick Stolee <stolee@gmail.com> wrote:
>>
>> On 12/18/2020 12:51 AM, Elijah Newren via GitGitGadget wrote:
>>> +     } else if (ci->df_conflict && ci->merged.result.mode != 0) {
>>>               die("Not yet implemented.");
>>>       }
>>>
>>>       /*
>>>        * NOTE: Below there is a long switch-like if-elseif-elseif... block
>>>        *       which the code goes through even for the df_conflict cases
>>> -      *       above.  Well, it will once we don't die-not-implemented above.
>>> +      *       above.
>>>        */
>>
>> This comment change might be a bit premature.
> 
> Or perhaps it should have been squashed into an earlier series that
> was already merged to next.

 
I think it works with the next patch, which removes the die() from the
if-elseif-elseif from immediately before the comment.

-Stolee