Re: Should I try to fix rebase interactive preserve-merges bug

From: Jacob Keller <jacob.keller@gmail.com>
Date: Mar 25, 2018, 18:07 UTC
Message-ID: <CA+P7+xqqLU-J5hv=yioMxMvp40hz_S9GfimjE7bp1Pj_TP-k3w@mail.gmail.com>
In-Reply-To: <CAKk8isqvfhiMPCdNBW5WNN4BfN1sLszekQscpy5M2Okh2YmbZg@mail.gmail.com>

On Sun, Mar 25, 2018 at 10:32 AM, Wink Saville <wink@saville.com> wrote:

Show 10 quoted lines

> There is a "TODO known breakage" in t3404-rebase-interactve.sh:
>
>    not ok 24 - exchange two commits with -p # TODO known breakage
>
> I'm contemplating trying to fix it. But with --recreate-merges coming
> maybe it's not worth the effort. Should I proceed with attempting a
> fix or is --preserve-merges going to be a synonym for
> --recreate-merges?
>
> -- Wink

AFAIK this breakage of preserve-merges is a design flaw which isn't really fixable, which is why --recreate-merges is being added.

I believe the plan is to deprecate preserve-merges once recreate-merges has landed.

Thanks, Jake