git rebase - can hg do that ?
Giorgos Keramidas
keramida at ceid.upatras.gr
Tue May 29 18:48:37 UTC 2007
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.
>> If you have made local commits and haven't "merged" any heads,
>> you can even put local changesets under MQ control "after the fact",
>> and use the MqMerge process to rebase your local patches.
>
> Given this fact it should be possible to create a hg rebase command
> based on Mq. This command should put every revision since last
> merge/first branch point under MQ control, hg qpop -a, update upstream
> branch, hg qpush -a.
>
> git's rebase function can also remove revisions from branches and
> other branch magic =)
>
> Guess I'll play with Mq for now...
Since "in repository" branches appear as "unmerged heads", it may be
possible to use a local "hg branch"ed repository to make something like
"hg rebase". I'm not sure how well it will work though, so at least
some testing to make sure it works without unexpected surprises would
be necessary :)
More information about the Mercurial
mailing list