[more experimients] (was: single-file-merge?)

[Uwe Brauer]

> I'm pretty sure all those file changes you threw away in the merge
> from meta to default will get stripped from meta if you later merge
> default back into meta.


I tried the following 
hg init
echo "First" > test.org
hg add test.org
hg commit  -m "0: First"
echo "Second" >> test.org
hg commit  -m "1: Second"
echo "Third" >> test.org
hg commit  -m "2: Third"
echo "Forth" >> test.org
hg commit  -m "3: BUG Fourth"
hg up -r 1
hg branch meta
echo "new stuff" >> meta.org
hg add meta.org 
hg commit -m "Add meta.org to the meta branch"
echo "Fifth" >> test.org
hg commit  -m "4: Fifth"
hg up default
echo "Six" >> test.org
hg commit  -m "5: Six"
hg merge  meta --tool internal:other 
hg revert --all -r default
hg revert test.org -r meta
hg commit -m "Single file merge: test.org"
echo "Seven" >> test.org
hg commit  -m "6: Seven"
hg up meta 
hg merge default --tool internal:other 
hg revert --all -r meta
hg revert test.org -r default
hg commit -m "Single file merge: test.org"


And it did what I expected.


Uwe 
> ________________________________

> This e-mail message, including any attachments, is for the sole use of
> the intended recipient(s) and may contain information that is
> confidential and protected by law from unauthorized disclosure. Any
> unauthorized review, use, disclosure or distribution is prohibited. If
> you are not the intended recipient, please contact the sender by reply
> e-mail and destroy all copies of the original message.

-- 
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/20231025/5a21267d/attachment-0001.p7s>