Release- and inbound- branches
- 2013.10.14 (aki) - transplanted 4e309e63c279 and 228626e1e57b from mozilla-release to mozilla-beta to get rid of non-ffwd warning for GECKO90_2011121217_RELBRANCH
- 2013.10.14 (aki) - transplanted b3273da80b44, b92f59193b52, 3fe6fa02e97a from mozilla-release to mozilla-beta to get rid of the non-ffwd warning for GECKO60_2011080402_RELBRANCH. This required updating to the proper parent of 3fe6fa02e97a before landing those two; then updating to 3190fd055f87 before landing b3273da80b44. Since b3273da80b44 doesn't have an a=, had to set treestatus to OPEN before pushing (then reverted treestatus).
Other non-ffwd issues
- 2013.10.21 mozilla-release migration happened the old way. Fixed via
hg debugsetparents 5f1868ee45cb 2d95954c16d4 hg commit -m "Merging heads for vcs-sync via |hg debugsetparents 5f1868ee45cb 2d95954c16d4|. DONTBUILD CLOSED TREE a=akeybl" hg push
I found the old head via:
# vcs2vcs@vcssync1 cd /opt/vcs2vcs/build/target/beagle git show release # The above command gave 5f15f23b78bf6b06a3f4d974565b1701b0cbe951 grep 5f15f23b78bf6b06a3f4d974565b1701b0cbe951 ../../upload/gecko-mapfile # The above command gave 5f15f23b78bf6b06a3f4d974565b1701b0cbe951 d3d09d464a4270abcfd404bee068e6b9a36fd6e4 # The hg commit is d3d09d464a4270abcfd404bee068e6b9a36fd6e4 # Go to http://hg.mozilla.org/releases/mozilla-release/rev/d3d09d464a4270abcfd404bee068e6b9a36fd6e4 # follow the "child" links until you get to http://hg.mozilla.org/releases/mozilla-release/rev/2d95954c16d4 # (that was the old head, until I used hg debugsetparents)