rebase: source is descendant of destination

[Yawar Amin]

On 4/23/10 4:47 AM, schrei5 said:
> OK I think I understand it know.
>
> I can't use rebase because rev 4 may depend on rev 3 or 2 (e.g. rev 4
> changes line 200 but in rev 1 the file is only 100 lines long).
>
> But if I know that there are no dependencies I can use Erics solution,
> right?
>   

Have you tried using

hg diff -r3:4 >../my.patch
hg up 1
hg import ../my.patch

as suggested by Matt [1]. This will create a new changeset ID but then,
that makes sense because the history of the changeset is different.

HTH,

Yawar

[1] http://www.selenic.com/pipermail/mercurial/2010-April/031626.html


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 258 bytes
Desc: OpenPGP digital signature
URL: <http://selenic.com/pipermail/mercurial/attachments/20100423/1c3f7f23/attachment.pgp>