single-file-merge?

Marcin Kasperski Marcin.Kasperski at mekk.waw.pl
Tue Oct 24 16:40:11 UTC 2023


>  hg up default 
>  hg merge  meta --tool internal:other
>  hg revert --all default
>  hg revert common-file.tex meta
>  hg commit -m "A single-file merge with common-file.tex"

IIRC revert fails to delete „new” files, at least this was the problem I
faced noticeable time ago while doing sth similar.

(specific problematic scenario is that of first merge after some
new file appeared on meta branch)


More information about the Mercurial mailing list