HotSpot workflow (original) (raw)

Claes Redestad claes.redestad at oracle.com
Tue Apr 14 12:39:40 UTC 2015

Hi,

I'm stuck in the bad(?) habit of using mq:

http://mercurial.selenic.com/wiki/MqExtension

It's obviously not without it's own faults, and there are some proponents of just committing your in-progress changesets locally and then use hg rebase/histedit to fold it all up into one changeset applied to the tip before pushing remotely:

http://mercurial.selenic.com/wiki/RebaseExtension http://mercurial.selenic.com/wiki/HisteditExtension

Either way, webrev has support to work across any number of applied changesets (using -r N), which helps ensure folding into one changeset can be deferred until it's time to push.

HTH

/Claes

On 04/14/2015 02: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.

More information about the hotspot-dev mailing list