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

From: Elijah Newren <newren@gmail.com>
Date: Dec 31, 2020, 17:13 UTC
Message-ID: <CABPp-BH6RPiTzmVM50HrOyq_Myyyuh_yQO3xwHv0vi-yZbw1Zg@mail.gmail.com>
In-Reply-To: <41ac7d44-e32b-99ed-c928-6325a02ba62c@gmail.com>

On Thu, Dec 31, 2020 at 3:17 AM Derrick Stolee <stolee@gmail.com> wrote:

Show 23 quoted lines

>
> On 12/30/2020 10:13 AM, Elijah Newren wrote:
> > 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.

Oh, right, it's been long enough that I forgot the details and then I read the patch backwards thinking it was adding the message. Yeah, it should go with the next patch. I'll fix it up.