rebase: source is descendant of destination
Haszlakiewicz, Eric
EHASZLA at transunion.com
Thu Apr 22 12:08:10 CDT 2010
>-----Original Message-----
>From: mercurial-bounces at selenic.com
[mailto:mercurial-bounces at selenic.com]
>On Behalf Of Kastner Masilko, Friedrich
>
>Is '--detach' not working in this case? I remember trying that back
when it
>was introduced, but I'm not sure now...
>
er... I didn't try. It wasn't obvious that that would do anything
useful. I just tried it, but the same error occurred. Just to be
clear, here's what I'm running:
repo revisions are linear: 1 -> 2 -> 3 -> 4 -> 5 -> 6 -> 7
hg rebase -s 6 -d 4 --detach
I ended up getting hg to do what I wanted through a combination of
transplant and strip:
hg up -r 4
hg transplant 6:tip
hg strip 6
(and now I'm just about to mark rev 5 as being a separate named branch)
I also noted this on the RebasePlan page on the wiki.
eric
More information about the Mercurial
mailing list