[issue266] Want an integrated way to move existing committed changes to mq control

[Jose M. Prieto]

El Lunes, 22 de Mayo de 2006 07:02, Bryan O'Sullivan escribió:
> On Sun, 2006-05-21 at 15:13 +0000, Danek Duvall wrote:
> >   Ultimately, I'd like for a user to be able to
> > have arbitrary local changes, be able to pull from a different repo, and
> > preserve those local changes *on top* of the remote changes, as this is a
> > key way that the opensolaris ON repo will work.
>
> Some portion of this is already possible with mq.  Obviously, managing
> branch structure isn't, but mq will let you rebase patches on top of
> some changes you've pulled, and do merges to fix up conflicts that the
> pull broke.  Unfortunately, I don't remember how to do this, and I don't
> believe it's been written up anywhere outside of IRC.

http://www.selenic.com/mercurial/wiki/index.cgi/MqMerge