single-file-merge?

[Uwe Brauer]

Hi all 

I have two branches

    1. default
    2. meta: which contains more files I don't want to have on the
       default branch.


I edit one file frequently that is on both branches. Then after
committing, I want always that all changes appear in the file in both
branches.

So say I finished an edit and commit on meta, I then do

 hg up default
 hg revert common-file.tex -r meta

That is ok, but the graph of course does not display it, because there
was no merge.

So I thought of doing a single-file-merge.

And did:

 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"

Any comments?

Uwe Brauer 

-- 
Warning: Content may be disturbing to some audiences
I strongly condemn Hamas bestialic terroristic attack on Israel, especially the despicable pogroms.
I strongly condemn Putin's war of aggression against Ukraine.
I support to deliver weapons to Ukraine's military. 
I support the NATO membership of Ukraine.
I support the EU membership of Ukraine. 
https://addons.thunderbird.net/en-US/thunderbird/addon/gmail-conversation-view/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5673 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20231024/f17a5980/attachment.p7s>