Re: [PATCH b4 0/6] review-tui: worktree-aware takes, resolve take->merge conflicts in place

On 2026-06-23 18:16 +0000, Konstantin Ryabitsev wrote:
> > b4 review's "take" action applies a reviewed series to a target branch by
> > one of two methods: a merge (git merge) or a linear/cherry-pick apply (git
> > am). Review is often driven from a different worktree than the one the
> > series is applied into, and the target branch may be checked out in yet
> > another worktree, so a take has to run wherever the target branch lives and
> > never disturb the current checkout. This series makes both take methods do
> > that correctly and teaches take->merge to resolve conflicts in place.
> 
> No objections to this at all, but I do want you to fix a few issues that
> running ci.sh identifies (mypy errors).
> 
> I should plug this into .b4-config, really, but until I do that, can you
> run ci.sh and ci-matrix.sh to make sure they are all green?

Sure. I fixed all mypy errors. There's a bunch of pre-existing ones:

- ty (121)
  all in 11 untouched files (misc/send-receive.py, __init__.py, the
  other TUI modules...) . Pre-existing on master, newly surfaced by
  ty 0.0.52 release and the all = "error" config.

- pytest (9)
  test_ez::test_trailers ×4 and test_mbox::test_shazam ×5. They exercise
  ez.py/mbox.py code byte-identical to master, so they fail identically
  there.

I'll send v2 in a minute or two.