mq mercurial repository available

Chris Mason mason at suse.com
Thu Sep 8 11:52:35 CDT 2005


On Thu, 8 Sep 2005 23:43:51 +0800
"Ling, Xiaofeng" <xiaofeng.ling at intel.com> wrote:

 
> good, I'm just thinking that if we have these enhanced commands,it
> will be perfect. 1. hg qimport <patch1> <patch2> ...
> import exist patches to manage by mq.
> it just do like:
> hg qnew patch1
> patch -p1 <patch1
> hg qrefresh

Yes, this is on the todo list.  It's near the bottom because I never
find myself using that command in quilt though ;)

> ... more patches
> 2. hg qimport can import description , user etc. 
>     hg qnew/qrefresh can add description.

I'll probably just do an hg qedit that opens the patch file under
$EDITOR.

> 3.hg qpopall
> 4.hg qpushall

You found these already...hg qpush/qpop -a

> 5.qpush can use three-way file merge, this can help a lot.
>    hg qpush -m <revid>
>  it will call hgmerge for revid, parents, parents+patch
> then we can have 
> 6. hg qmove <revid>
> it just do like
>  hg qpopall
>  hg qpush -m <revid>
>  hg qrefresh
>  ....
>  deal with more patches.
>  
> then we can easily move a serial of patches to new base revision.

This is something I've wanted from quilt for a long time.

My TODO list for the patch queue features:

1) Make the changegroup and strip code clean enough for Matt to merge

2) Add the concept of subrepositories to Mercurial.  .hg/patches would
(optionally) be under revision control, but as a separate repository.
push/pull/clone of the main rep would include the .hg/patches rep as
well.

3) Adding nice merging for rebasing patches against a new rev.

4) Other neat things found in quilt.

-chris


More information about the Mercurial mailing list