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

Bryan O'Sullivan bos at serpentine.com
Mon May 22 00:02:48 CDT 2006


On Sun, 2006-05-21 at 15:13 +0000, Danek Duvall wrote:

> (Originally from issue 249.)  If I've one or more committed changes to a repo,
> and then decide that I want to be able to push and pop these changes with mq,
> it'd be nice to be able to.

Yes, this would be very nice to have.  I've wanted the feature several
times myself.

> Chatting with cmason on IRC, it seems that this could be managed by exporting
> the changesets to patches in .hg/patches, and whacking at the series file.

Yep.  Just insert each retro-mq-ified changeset at the top of the series
file, and ditto with the status file.

> Branches (including merges) couldn't be handled without extra work.

mq has no notion of branches at all; I think it would be most
appropriate to just error out on them.

> Whether or not this feature should be integrated, or left up to the end-user to
> implement is possibly debatable.

I'd really like to see an mq command to retroactively turn changesets
into patches.

>   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.

	<b



More information about the Mercurial mailing list