HotSpot workflow

[Vladimir Ivanov]

Andrew,

mq [1] is part of my workflow.

Also, rebase [2] + strip [3] + histedit [4] combo looks like a good 
alternative.

I played with rebase and it enables interactive merge during rebase.
AFAIK mq doesn't support that.

Best regards,
Vladimir Ivanov

[1] http://mercurial.selenic.com/wiki/MqExtension
     My top commands:
     # Create new patch from uncommitted changes
     $ hg qnew <name>

     # Update applied patch on top and edit changeset message
     $ hg qrefresh -e

     $ hg qpush <name>
     $ hg qpush [--move] [<name>]

     # Fold 2 patches
     $ hg qfold ...

     # Commit the patch
     $ hg qfinish

[2] http://mercurial.selenic.com/wiki/RebaseExtension
[3] http://mercurial.selenic.com/wiki/StripExtension
[4] http://mercurial.selenic.com/wiki/EditingHistory

On 4/14/15 3:26 PM, Andrew Haley wrote:
> I'm having some practical problems with the HotSpot workflow.
>
> I usually have several patches on the fly at any time, but webrev and
> Mercurial don't really help.  "hg push" and "hg merge" work on the
> whole repo, not just a changeset, so I've been manually saving
> changesets and re-merging them into the master tree, which is very
> error-prone and has led to some mistakes submitting changes.
>
> Also, the need to submit a change as a single changeset makes it
> awkward to commit regularly as I work on a patch; I can't find any way
> to merge a set of changes into a single changeset and push that.
>
> So, what do you do?  Do you keep a source tree checked out for every
> webrev?  Do you regularly commit as you work?  Am I missing
> some tricks?
>
> Thanks,
> Andrew.
>