move/copy/becase on changeset form a named branch to another
Uwe Brauer
oub at mat.ucm.es
Sun Jul 21 12:59:05 UTC 2024
Hi
I have the following graph
○ changeset: 692:915a0b99e54f
│ Branch: default
│ Author: XXXXX
│ Date: Tue, 25 Apr 2023 14:31:57 -0400
│ Summary: remove compile warning related to electric-pair-mode handling
│
○ changeset: 691:998feef96869
│ Branch: master
│ Author: XXXXX
│ Date: Mon, 24 Apr 2023 14:48:55 +0200
│ Parent: 689:1e7c7df6f86f
│ Summary: Apply patch provided by Peter Mao
│
│ ○ changeset: 690:94326aa43573
│╱ tag: default/org-mode
│ Branch: org-mode
│ Author: XXXXX
│ Date: Sat, 22 Apr 2023 14:37:02 +0200
│ Summary: Add org file, that describe how to use the python engine not the native one
│
○ changeset: 689:1e7c7df6f86f
| Branch: default
│ Author: XXXXX
│ Date: Mon, 10 Apr 2023 16:05:31 -0400
│ Summary: matlab and org mode example
But it should be
○ changeset: 692:915a0b99e54f
│ Branch: default
│ Author: XXXXX
│ Date: Tue, 25 Apr 2023 14:31:57 -0400
│ Summary: remove compile warning related to electric-pair-mode handling
│
○ changeset: 691:998feef96869
│ Branch: default
│ Author: XXXXX
│ Date: Mon, 24 Apr 2023 14:48:55 +0200
│ Parent: 689:1e7c7df6f86f
│ Summary: Apply patch provided by Peter Mao
│
│ ○ changeset: 690:94326aa43573
│╱ tag: default/org-mode
│ Branch: org-mode
│ Author: XXXXX
│ Date: Sat, 22 Apr 2023 14:37:02 +0200
│ Summary: Add org file, that describe how to use the python engine not the native one
│
○ changeset: 689:1e7c7df6f86f
| Branch: default
│ Author: XXXXX
│ Date: Mon, 10 Apr 2023 16:05:31 -0400
│ Summary: matlab and org mode example
That is changeset 691:998feef96869
Should belong to the default branch, but not to the master branch, that
just contains this changeset.
It tried rebase
hg rebase -d 689 -s 691
But that had some unpleasant consequences for other branches, so some
changesets from another branch ended up in default. (I consider rebase
always as a method of last resort)
Thanks
Uwe Brauer
--
I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel
I strongly condemn Putin's war of aggression against Ukraine.
I support to deliver weapons to Ukraine's military.
I support the EU and NATO membership of Ukraine.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5684 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20240721/afe4ab53/attachment.p7s>
More information about the Mercurial
mailing list