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.

Hm, good point I have to check

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


The problem is: that most likely works nicely if I commit per file, but
sometimes the commit includes the file I want in default and another
file I don't want (right I should have checked, and right I got do
rollback, or uncommit, but this approach needs also care).


> I'm not sure how grafted commits look in the console but in TortoiseHg
> grafts are shown with a dashed line while merges and regular commits
> are shown with a solid line. Graft also adds to the commit message
> telling you where the commit was grafted from.

With the --log option, yes, and at least for me, on the console there is no
visual indication. I think I asked for one some time ago, but did not
get any feedback


> Mischa

> ________________________________

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