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

Samuel Masham samuel.masham at gmail.com
Wed May 24 09:24:18 CDT 2006


Hi Bryan, Danek, and Chris?

On 5/22/06, Bryan O'Sullivan <bos at serpentine.com> wrote:
> 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.

Ok ... here is a patch (against crew) to do this.

However I think this may cause trouble.

mq can only be used completely guilt free on leaf nodes, if people
start "popping and pushing" changes that have already been cloned
things get strange...

This is what I tryed to address before Christmas...

I think that approach may well be wrong but the issue is real.

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

yep, I tryed (did?) adding branch (multi parent) preservation to mq
and it didn't go down too well. It just makes a lot of mess for not
much gain.

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

... would you really?

The patch itself isn't perfect but mostly will do exactly that.

Samuel

ps my rough test...

hg init testr
cd testr/
echo boo > hello
hg add
hg ci -m "hello added"
echo one >> hello
hg ci -m "hello echoed"
echo 1243 >> hello
hg ci -m "1234 echoed"
hg log
hg qinit
hg qpop
hg qpop -g
hg qpop -g 123.patch
hg log
hg qpop -g hellocontent.patch
hg log
hg qpop -g hellomade.patch
hg log
hg qpop -g endofline.patch
hg log
hg qpush -a
hg log

list of bugs available on request *grin*
-------------- next part --------------
A non-text attachment was scrubbed...
Name: hg-qpop-grab.patch
Type: application/octet-stream
Size: 4306 bytes
Desc: not available
Url : http://www.selenic.com/pipermail/mercurial/attachments/20060524/5fbe2c2e/hg-qpop-grab-0001.obj


More information about the Mercurial mailing list