[more experimients]

[Uwe Brauer]

> From: Uwe Brauer
> Sent: Wednesday, October 25, 2023 12:16 AM
> Subject: [more experimients] (was: single-file-merge?)

> You're right. As long as you remember to repeat your 'Single file

[Snip]...


> The only other thing I'd point out is your test example doesn't give
> you the same result as using graft because you aren't actually merging
> your single file, you're replacing it. 


That is correct, as I said in the beginning I was using just revert, but
wanted in addition some visual feed back in the graph. This is why I
came up with that solution, and its a corner case to call it merge.

> If it was your intent to replace all changes to test.org in default
> great. But if you only intended to replace the bugged Forth change and
> forgot you also had a Third and Six change...

Right, then I either 

    1. need graft (and hopefully did a one file commit before)

    2. Or things get tricky, if I drop the tool --tool internal:other
       option, then a real merge occurs, however then I must so to speak
       undo all the unwanted parts of the merge manually, since I am not
       sure there exist simple commands to deal with it.

I really wish, a graft operation would be somehow displayed in the graph
say by dots instead of lines

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