[patch] update mq to work with "current" hg

[Chris Mason]

On Tue, Nov 08, 2005 at 09:33:52PM +0100, Radoslaw Szkodzinski wrote:
> Theodore Ts'o wrote:
> > On Mon, Nov 07, 2005 at 11:17:08PM -0800, Bryan O'Sullivan wrote:
> >> On Mon, 2005-11-07 at 22:36 -0800, Matt Mackall wrote:
> >>
> >>> I also need to see more people using, discussing, and hacking on it.
> >> I use mq all the time, but it politely fails to break on me, so I don't
> >> have much to say on an ongoing basis.  I'm looking forward to it coming
> >> in from the cold.
> > 
> > Ditto.  I also find the strip functionality to be useful, and have
> > been currently torn betewen using the version of hg in Chris's mq
> > repository, versus the new toys/features in the latest hg
> > repository.... for the moment I've stuck with using the hg in Chris's
> > mq repository, which means I'm not testing hg mainline.  
> 
> On the other hand, I'm merging mq repo to the mainline and it seems to
> work. (at least what I usually use works)
> the conflicts were small and easy to resolve.
> 
> Is there any other, fresher repository than
> http://hg.serpentine.com/mercurial/mq around? Something having recently
> discussed development changes... (especially autosync)

No, but I'll have that mq repo updated soon.

> 
> My experience is that mq is close to being as easy to use as quilt, but
> I miss automatic patch folding functionality (hg qfold), which I used to
> merge patches.

qfold is on the todo list, but I'll probably do it after better three
way merging.  You can get the same thing from patch -p1 < patch ; hg
qrefresh, but I'll glad take a patch that implements qfold.

-chris