Page History

...

$ # From local forest
$ hg tpull # make sure the default branch has latest changes
$ hg -R hotspot update "JDK-7000001"  # make sure you are sitting on your branch
$ hg -R jdk update "JDK-7000001"
$ hg tmerge default 
$ hg tcommit -m "Merge"

There is something to be careful about in the previous example.  If you merge just prior to pushing your branch to the submission forest, then the commit message for your changeset when it is integrated upstream will be taken from your merge changeset.  As such, your merge changeset should describe your fix, your reviewers etc. and should not be just the simple string "Merge".  This is different from standard OpenJDK practice and some may find it odd.  There is, however, another way to merge in upstream changes before your push that avoids this issue.

<<insert rebase example>>

How should I push a branch?

...