As per the release schedule [1] we're having the following dates for the merge: 2014-08-25 (Monday): Beta -> Release 2014-09-02 (Tuesday): Aurora -> Beta & Nightly -> Aurora Please note that the second merge day is not at the usual Monday time because of Labour day in US & Canada, and has been postponed for the next day. [2] [1] https://mail.mozilla.com/home/publiccalendar@mozilla.com/Releases%20Scheduling.html [2] https://groups.google.com/forum/#!msg/mozilla.dev.planning/Z52nJuiak8I/P-U_zEi_PtkJ

I'll take care of this and prepare a patch today.

Merge patch, I have added the removal of testAboutCache.js, since the merge patch didn't do that. That was made in bug 888924.

Comment on attachment 8478379 [details] [diff] [review] beta_release.patch Review of attachment 8478379 [details] [diff] [review]: ----------------------------------------------------------------- Looking at the patch it is fine. But what I miss here is feedback if the tests you wanted to run were successful! Please make sure that you give this information in the future. For now I assume this is the case, otherwise the patch wouldn't be up for review.

Comment on attachment 8478379 [details] [diff] [review] beta_release.patch https://hg.mozilla.org/qa/mozmill-tests/rev/c6e582149614 (Added tag RELEASE_BASE_20140825 for changeset 295fa1fe73a2) http://hg.mozilla.org/qa/mozmill-tests/rev/9bc28a446750 (Bug 1056477 - Merge mozilla-beta to mozilla-release for Firefox 32) http://hg.mozilla.org/qa/mozmill-tests/rev/f0bc16ef784d (Added tag FIREFOX_RELEASE_32 for changeset 9bc28a446750)

This tested well, no changes to the discovery pane tests as bug 1059659 will fix that.

This also is fine, the only weird thing here is that we had no conflict in the .hgtags file.. andreeamatei@P4986:~/mergeDef_aurora$ hg merge -r default merging firefox/tests/functional/testPrivateBrowsing/testAboutPrivateBrowsing.js merging firefox/tests/functional/testPrivateBrowsing/testOpenClosePBKeyboardShortcut.js merging firefox/tests/remote/restartTests/testDiscoveryPane_FirstTimeModule/test1.js merging firefox/tests/remote/restartTests/testDiscoveryPane_installCollectionAddon/test1.js merging firefox/tests/remote/restartTests/testDiscoveryPane_installPickOfMonthAddon/test1.js 95 files updated, 5 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)

Updated after the backport in bug 1046078.

Comment on attachment 8482626 [details] [diff] [review] aurora_beta.patch Review of attachment 8482626 [details] [diff] [review]: ----------------------------------------------------------------- Big patch. Only did a spot check, looks good. Tests run fine. ::: .hgtags @@ +131,5 @@ > 52d218602765650269f6dfd5bb8c229406a3ce7c AURORA_BASE_20140609 > 8e9602be29f9fbc3967857428d2ac7b5f7e18c1b FIREFOX_BETA_31.0 > 76f7df61ebaf339695a5dfb6bdfcaa0ffba5ab7c RELEASE_BASE_20140714 > 0772c6d27382ee81c8db8d2d8ad159a2cf339d93 FIREFOX_AURORA_32.0 > +4074bdcad41a03cbfb43ca9b7aaa574513cf2ce0 AURURA_BASE_20140721 Seems we introduced a typo some time ago. We should fix it. We shouldn't block the merge for this though, it can be done later.

Comment on attachment 8482608 [details] [diff] [review] default_aurora.patch Review of attachment 8482608 [details] [diff] [review]: ----------------------------------------------------------------- Doing a merge gives me the same result. > hg merge -r default But doing a branch diff: > hg diff -r mozilla-aurora:default Gives me more changes that should appear as conflicts but don't... I'm not sure why this is yet (this appears to have been the case for some time, these changes are pretty old and appear to be "locked" in default).

So this problem doesn't seem to have have a big impact right now. Most of the difference I'm seeing are comments (but this could have weird ramifications! so it should be checked out). For example we have bug 872918 which was checked in on default on June 11th: http://hg.mozilla.org/qa/mozmill-tests/rev/5989a11103a5 Most of the changes are now visible in mozilla-aurora as well. But check the skip comment at the end of this test: http://hg.mozilla.org/qa/mozmill-tests/file/default/firefox/tests/remote/restartTests/testDiscoveryPane_installPickOfMonthAddon/test1.js vs http://hg.mozilla.org/qa/mozmill-tests/file/mozilla-aurora/firefox/tests/remote/restartTests/testDiscoveryPane_installPickOfMonthAddon/test1.js There are a few others. This is a comment and has no real effect, but if the merge tool is not functioning properly (or perhaps we are misusing it) we might indeed have problems between our branches.

With the discussion I had with Henrik on IRC, this was probably because of conflicts we previously had, and since mercurial merges based on changesets, it will not pick up remaining changes due to conflicts (since the original changeset was merged, even if not completely). I will update the docs to have another step during the merge to manually check that branches are synced and add all remaining changes to the merge patch. This should bring us back on track. I will also check the branches now to see if there's anything outstanding between them when they should be synced (and file bugs appropriately if needed).

Comment on attachment 8482608 [details] [diff] [review] default_aurora.patch Review of attachment 8482608 [details] [diff] [review]: ----------------------------------------------------------------- Given the previous comments this is good. We'll check later on all missing changes.

Merges are done. So please start merging our branches, Andreea. Thanks

http://hg.mozilla.org/qa/mozmill-tests/rev/62500906b763 (aurora tag) http://hg.mozilla.org/qa/mozmill-tests/rev/192bd9d3b65d (aurora-beta merge) http://hg.mozilla.org/qa/mozmill-tests/rev/fc85e2765070 (beta tag) http://hg.mozilla.org/qa/mozmill-tests/rev/0e7078fab76b (default tag) http://hg.mozilla.org/qa/mozmill-tests/rev/3da276623c38 (merge default-aurora) http://hg.mozilla.org/qa/mozmill-tests/rev/8ed7c1ed4a3d (aurora tag) Done!