linear history, various commits on the wrong named branch, graft refuses

Uwe Brauer oub at mat.ucm.es
Fri Apr 29 08:38:18 UTC 2022


Hi

Without realising  it, I have quite a bit of changesets on the wrong named branch. So my graph looks like


◍  changeset:   368:072bfc0424f6
│  Branch:      mac
│  tag:         tip
│  Author:      Uwe Brauer  <oub at mat.ucm.es>
│  Date:        Fri, 29 Apr 2022 10:22:43 +0200
│  Topic:       hacks
│  Phase:       draft
│  Summary:     New function, generatlising org-set-property
│
â—‹  changeset:   367:600a0049f89e
│  Branch:      mac
│  Author:      Uwe Brauer  <oub at mat.ucm.es>
│  Date:        Tue, 19 Apr 2022 10:34:52 +0200
│  Topic:       hacks
│  Phase:       draft
│  Summary:     Snapshot for backup
|


Etc
â—‹  changeset:   348:db2bd003001c
│  Branch:      mac
│  Author:      Uwe Brauer  <oub at mat.ucm.es>
│  Date:        Tue, 08 Jun 2021 16:05:46 +0200
│  Topic:       hacks
│  Phase:       draft
│  Summary:     update to mac branch
│
â—‹  changeset:   347:b8a54846c084
│  Branch:      default
│  Author:      Uwe Brauer  <oub at mat.ucm.es>
│  Date:        Sun, 30 May 2021 18:21:15 +0200
│  Topic:       hacks
│  Phase:       draft
│  Summary:     Snapshot




So I basically want all the changesets from 348-368 to be on the default
branch not on the mac branch.

I am afraid of the rebase command, so I prefer to use graft, but I obtain 

hg graft --log -r 348::368 -r 347 

skipping ancestor revision 348:db2bd003001c

Since it is a linear history.

Any idea what to do (ok I could use evolve since the changesets are in
draft mode, but I prefer to avoid that


Any ideas

Uwe Brauer 

-- 
I strongly condemn Putin's war of aggression against the Ukraine.
I support to deliver weapons to Ukraine's military. 
I support the ban of Russia from SWIFT.
I support the EU membership of the Ukraine. 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5673 bytes
Desc: not available
URL: <http://www.mercurial-scm.org/pipermail/mercurial/attachments/20220429/5781682d/attachment.bin>


More information about the Mercurial mailing list