Fwd: Advantages of MQ over vanilla hg

[Giorgos Keramidas]

On 2007-03-12 06:52, Ben Hood <0x6e6562 at gmail.com> wrote:
> >... and because I don't necessarily want to have that 2nd corrective
> >patch in the patch history.  A lot of it is wanting to keep the
> >revision history clean, from the point of view of easy bisection, and
> >making it easier for people to browse the history months or years
> >later.
> 
> What workflow look like in the case that you were using MQ and you had
> to modify a patch somebody submitted? Something like:
> 
> hg import PATCHFILE
> edit it
> hg qrefresh

You can 'save' the patch queue state like this:

    hg qimport PATCHFILE
    hg qcommit -m 'save patch state'
    [ edit some files ]
    hg qrefresh

or you can stack another local patch on top of PATCHFILE:

    hg qimport PATCHFILE
    [ edit some files ]
    hg qnew -fe PATCHFILE-FIXES
    
The second is slightly cleaner, IMHO, because it lets you keep your
local patch updates as a second patch, which can be pushed and popped on
top of the PATCHFILE changes at will.

HTH,
Giorgos