...
If you'd like to avoid this oddity, you may prefer to rebase your change like this:
Code Block | ||
---|---|---|
| ||
$ # 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 -R hotspot rebase -d default --keepbranches $ hg -R jdk rebase -d default --keepbranches |
Unfortunately the trees extension does not support a trebase command.
Note that the rebase extension may need to be enabled in your .hgrc
file prior to using the rebase command.
How should I push a branch?
...
Overview
Content Tools
ThemeBuilder