git rebase - can hg do that ?

[David Jack Olrik]

On 31/05/2007, at 22.38, John Goerzen wrote:

> On 2007-05-29, Giorgos Keramidas <keramida at ceid.upatras.gr> wrote:
>> On 2007-05-29 20:42, David Jack Olrik <david at olrik.dk> wrote:
>>> On 29/05/2007, at 16.26, Giorgos Keramidas wrote:
>>>> MercurialQeueus can do that, and it works nicely for local patch  
>>>> queues:
>>>
>>> Mq looks nice, but is a bit more work than just writing 'hg  
>>> rebase <branch>'
>>
>> Indeed.  I haven't really tried MqMerge with the "in repository"
>> branches of Hg.  Things may be easier or tougher... I don't know yet.
>
> hg transplant does exactly what you want, and it works with 0.9.3

Actually it doesn't, according to the docs it does the following:

"Selected changesets will be applied on top of the current working  
directory with the log of the original changeset."

This is not what I want.

Before rebase:
                  A---B---C topic
                 /
            D---E---F---G upstream

After rebase:
                          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.

If 'hg transplant' really can do this could someone show me the  
actual command to do it ?

-- 
Best regards,
David Jack Olrik <david at olrik.dk>             http://david.olrik.dk
GnuPG fingerprint C290 0A4A 0CCC CBA8 2B37 E18D 01D2 F6EF 2E61 9894
["The first rule of Perl club is  You do not talk about Perl club"]



-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 1855 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20070602/2b2e8510/attachment-0001.p7s>