single-file-merge?

[Uwe Brauer]

>>> "MK" == Marcin Kasperski <Marcin.Kasperski at mekk.waw.pl> writes:

>> 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)

That looks strange.

Here is an example

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"

Now I just want to merge test.org from meta into default 
I run 

 hg up default
 hg merge meta --tool internal:other
 hg revert all -r default
 hg revert test.org -r meta

 then before commit 

 hg status shows me 

M test.org
R meta.org
? test.org.orig

(I prefer not to use --no-backup option)

So I am not sure what the corner case you encountered.

Uwe 



-- 
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/255620bd/attachment.p7s>