Webrev and multiple changesets
Aleksey Shipilev
shade at redhat.com
Tue Nov 21 14:30:30 UTC 2017
On 11/21/2017 03:23 PM, John Paul Adrian Glaubitz wrote:
> Hello!
>
> Can someone give a hint on how to use webrev when making multiple,
> independent changes? Since I'm still rather a beginner when it comes
> to Mercurial, I have no idea how to use branches.
Use mq. Then webrev would generate the difference against repository with all your mq patches
applied. When you are happy, qfinish converts them to individual changesets, and you can push.
> I have now fixed JDK-8187227 and created a webrev for it in [1].
>
> Now, I also want to fix JDK-8191663, commit the changes and run webrev,
> it will create a changeset which includes the changes for 8187227 as
> well which is not what I want.
>
> I tried checking out a second a branch but the commit for JDK-8187227
> is still in the history.
>
> Can someone tell me what the proper process in this context is?
I'd say:
$ hq qnew 8187227-fix
# <do work for 8187227>
$ hg qrefresh -m "Fix for 8187227"
$ hg qnew 8191663-fix
# <do work for 8191663>
$ hg qrefresh -m "Fix for 8191663"
$ ksh ./webrev.ksh
# webrev is generated for both 8187227 and 8191663.
# use ./webrev.ksh -r to change the base for comparisons
# unhappy with patch? roll back/forth with qpop/qpush,
# ...make changes, qrefresh
$ hg qpush -a
# run tests
$ hg qfinish -a
# both patches are converted to individual changesets in repo
$ hg push
Thanks,
-Aleksey
More information about the hotspot-dev
mailing list