Re: merging tmux - lots of extra files

[Thomas Klausner <wiz%netbsd.org@localhost>]

On Tue, Jun 16, 2026 at 04:29:54PM +0100, Taylor R Campbell wrote:
> 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!)

Yes, that is a good hint, and the instructions you wrote at
https://www.netbsd.org/developers/mercurial/vendor.html worked well in
my case. I'm fine with using those in the future.

> Can you share:
> 
> (a) the sequence of commands you ran,

Just this:
(hg update trunk)
hg merge TMUX

> (b) the list of files in question, and

Lots of removed files reappeared.

I think you re-created it locally, so I'll skip the filescript.


Cheers,
 Thomas