single-file-merge?

[Uwe Brauer]

> When I need changes made in another branch pulled into default without
> everything else in the branch I use hg graft. Graft merges over just
> the specific commit(s) you've selected, not the whole branch. As long
> as the changes you want to pull into default are in their own commits,
> doing this with graft is quite easy.

There is another problem with graft. There is no option to force him to
«solve» a conflict the way 
hg merge --tool internal:other

Does, at least the documentation does not say anything about it.

I just tried out 

graft --log --tool internal:other -r default -r meta
skipping ancestor revision 6:33f6f666563d
grafting 5:b21cd5f983e8 "4: Fifth"

Then now log message does not indicate anything.

Just  hg revert test.org -r meta
would have achieved something similar

Hm..




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