mercurial Mercurial Queues Rebase
Example
To rebase with latest changesets in upstream repository:
hg qpop -a // Pop all patches
hg pull -u // Pull in changesets from upstream repo and update
hg qpush -a // Push all patches on top of new changesets
If there are any conflicts you will be forced to merge your patches.
