experimental mq v0.37 available

[Samuel Masham]

Hi Chris, All,

Got round to doing some testing but now on version .39 nice work with
the series handling it should make life easier for a lot of people.

(tested with andrews quilt stack against 2.4.15-rc2 ish - no problems)

on to the merge work:

On 28/11/05, Chris Mason <mason at suse.com> wrote:
> I've made the changes in mq required to support patches in the queue
> with more than one parent.  This makes merging easier when you have a
> queue of patches changing the same file more than once.  It includes
> Samuel's fix from last week.

Ok, multiple merge/ parents behavior is working nicely and gives nice results.

However this is NOT different from my patch on its own in this
respect. As the p0 (first parent) is always your ancestor on the stack
the original codes multi-parent blindness didn't matter (just
discarding the guard on qrefresh etc should let it work, qpush qpop
worked fine as is ...)

It follows that *if* i am correct in this then you don't need the 
".hg.patches.merge.marker" maybe... (if pparents ever returns p2 then
I am defiantly wrong, but my theory is that it can't).

Now the remaining versioning issue is with qpop -a / qpush -a losing
the merge information. I wil send a separate mail on why this may
matter sometimes.

(nice to see qrefresh keeps this info now though)

> The changes were not small, so please stick with mq v0.36 or v0.35
> unless you want to help debug things.

Nothing going wrong so far so no fixes as yet.

Samuel

> You can pull it from:
>
> http://www.serpentine.com/~cmason/mq
>
> -chris
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>