Re: merging tmux - lots of extra files

[Taylor R Campbell <riastradh%NetBSD.org@localhost>]

> Date: Tue, 16 Jun 2026 17:55:20 +0200
> From: Thomas Klausner <wiz%netbsd.org@localhost>
> 
> For preparation on working with hg src, I've tried updating tmux
> in the hg test repository.
> 
> Step zero of that was getting the tree in a good shape, i.e. letting
> mercurial know that TMUX is fully merged into trunk.
> 
> So I did 'hg merge TMUX' and then copied the current state of 'trunk'
> there to avoid weirdnesses -

You will probably want to use `hg merge -t :local' or similar in order
to force a vacuous merge that doesn't actually change the working
tree, for the sake of a future merge that will.  (Sorry, haven't
gotten to writing the vendor branch instructions yet!)

>                              but I still have some: there are many new
> files that, I guess, were removed from tmux at some point but still
> exist in the TMUX branch.
> 
> Is this expected or a problem in the conversion?

Can you share:

(a) the sequence of commands you ran,
(b) the list of files in question, and
(c) a complete typescript of the interaction with outputs?

The content of the vendor branches produced by CVS is kind of weird --
if things were ever moved from, e.g., src/dist/tmux to
src/external/bsd/tmux then the old src/dist/tmux never actually goes
away on the vendor branch unless you go out of your way to get rid of
it.  I don't think tmux was ever in src/dist, though.  In any case,
steps to reproduce will help to get this straight.