git rebase - can hg do that ?

John Goerzen jgoerzen at complete.org
Sat Jun 2 01:21:35 UTC 2007


On Sat, Jun 02, 2007 at 02:23:23AM +0200, David Jack Olrik wrote:
>                          A'--B'--C' topic
>                         /
>            D---E---F---G upstream
> 
> What I want is my topic branch to be updated with the changes from  
> upstream, with my changes applied on top (i.e. remove my changes from  
> the branch, update id, and re-apply my changes), not the other way  
> around.

But it is the same.  All you have to do is hg update -C to the other
branch, then use hg transplant.

-- John



More information about the Mercurial mailing list