From: Taylor Blau <me@ttaylorr.com>
Date: Fri, 17 Sep 2021 04:14:41 GMT
Subject: Re: [PATCH v2 4/7] p5326: create missing 'perf-tag' tag
Message-ID: <YUQWMWiVDyDz9qRV@nand.local>
In-Reply-To: <YUPHBv3d5p67NAnJ@coredump.intra.peff.net>

On Thu, Sep 16, 2021 at 06:36:54PM -0400, Jeff King wrote:
> On Tue, Sep 14, 2021 at 06:06:09PM -0400, Taylor Blau wrote:
>
> > Some of the tests in test_full_bitmap rely on having a tag named
> > perf-tag in place. We could create it in test_full_bitmap(), but we want
> > to have it in place before the repack starts.
>
> I wondered how p5326 ever could have worked without this.
>
> [...]
>
> Knowing the history of the midx-bitmap series, I'm almost certain what
> happened is that it got rebased, and you probably _did_ see a textual
> conflict, which you resolved correctly, moving the perf-tag test into
> lib-bitmap.sh But you missed the semantic conflict that p5326 also
> needed to add in the setup step.

Sounds about right :-).

Thanks,
Taylor