b4 prep confused by rebase from linus/master to linux-next/master?

b4 prep confused by rebase from linus/master to linux-next/master?

[Jeff Johnson]

I have a b4-managed branch that was originally based upon linus/master.
However that patch had a conflict with linux-next/master, so I rebased my b4
branch to linux-next/master and resolved the conflicts. But that seems to have
confused b4 since I don't get the expected results from:
[jjohnson:development 8934] b4 prep --check
[jjohnson:development 8935] b4 prep -c
Will collect To: addresses using get_maintainer.pl
Will collect Cc: addresses using get_maintainer.pl
[jjohnson:development 8936] b4 send --no-sign --reflect
[jjohnson:development 8937] b4 --version
0.14.0

b4 seems to be acting like I don't have a patch to process.

Is there an easy way to "un-confuse" b4?

/jeff

Re: b4 prep confused by rebase from linus/master to linux-next/master?

[Konstantin Ryabitsev]

On Mon, Jun 24, 2024 at 03:42:02PM GMT, Jeff Johnson wrote:
> I have a b4-managed branch that was originally based upon linus/master.
> However that patch had a conflict with linux-next/master, so I rebased my b4
> branch to linux-next/master and resolved the conflicts. But that seems to have
> confused b4 since I don't get the expected results from:
> [jjohnson:development 8934] b4 prep --check
> [jjohnson:development 8935] b4 prep -c
> Will collect To: addresses using get_maintainer.pl
> Will collect Cc: addresses using get_maintainer.pl
> [jjohnson:development 8936] b4 send --no-sign --reflect
> [jjohnson:development 8937] b4 --version
> 0.14.0

Can you paste "b4 prep --show-info" for that branch?

-K

Re: b4 prep confused by rebase from linus/master to linux-next/master?

[Jeff Johnson]

On 6/25/2024 7:20 AM, Konstantin Ryabitsev wrote:
> On Mon, Jun 24, 2024 at 03:42:02PM GMT, Jeff Johnson wrote:
>> I have a b4-managed branch that was originally based upon linus/master.
>> However that patch had a conflict with linux-next/master, so I rebased my b4
>> branch to linux-next/master and resolved the conflicts. But that seems to have
>> confused b4 since I don't get the expected results from:
>> [jjohnson:development 8934] b4 prep --check
>> [jjohnson:development 8935] b4 prep -c
>> Will collect To: addresses using get_maintainer.pl
>> Will collect Cc: addresses using get_maintainer.pl
>> [jjohnson:development 8936] b4 send --no-sign --reflect
>> [jjohnson:development 8937] b4 --version
>> 0.14.0
> 
> Can you paste "b4 prep --show-info" for that branch?
> 
> -K

I was already able to fix this by manually changing base-branch in the metadata.

/jeff

Re: b4 prep confused by rebase from linus/master to linux-next/master?

[Konstantin Ryabitsev]

On Tue, Jun 25, 2024 at 09:05:15AM GMT, Jeff Johnson wrote:
> > Can you paste "b4 prep --show-info" for that branch?
> 
> I was already able to fix this by manually changing base-branch in the metadata.

Okay, I suspected that you have a non-default cover strategy, right?

-K

Re: b4 prep confused by rebase from linus/master to linux-next/master?

[Jeff Johnson]

On 6/25/2024 10:24 AM, Konstantin Ryabitsev wrote:
> On Tue, Jun 25, 2024 at 09:05:15AM GMT, Jeff Johnson wrote:
>>> Can you paste "b4 prep --show-info" for that branch?
>>
>> I was already able to fix this by manually changing base-branch in the metadata.
> 
> Okay, I suspected that you have a non-default cover strategy, right?
> 
> -K
Correct. I'm currently using cover-strategy: branch-description
I kept stumbling across issues with the default strategy so I moved to the
branch description strategy.

And it seems that doesn't work well with b4 prep --cleanup either since it
seems to remove the metadata but doesn't actually remove the branch.

With my recent MODULE_DESCRIPTION cleanup I made the realization that having
the metadata in-tree would have been better since I distributed the work
across multiple repos to have per-architecture builds.

So at some point I'll probably go back to the default strategy.

/jeff

Re: b4 prep confused by rebase from linus/master to linux-next/master?

[Konstantin Ryabitsev]

On Tue, Jun 25, 2024 at 10:35:46AM GMT, Jeff Johnson wrote:
> Correct. I'm currently using cover-strategy: branch-description
> I kept stumbling across issues with the default strategy so I moved to the
> branch description strategy.
> 
> And it seems that doesn't work well with b4 prep --cleanup either since it
> seems to remove the metadata but doesn't actually remove the branch.

Hmm... that would be a bug. It's not shocking, because non-default cover
strategies see a lot less testing.

Do you mind sending a separate message to this list describing the problem you
saw with --cleanup? This way I can turn it into a bug.

-K