Confirmed users, Bureaucrats and Sysops emeriti
2,976
edits
No edit summary |
|||
Line 21: | Line 21: | ||
hg -R $CLONE pull -u -r default | hg -R $CLONE pull -u -r default | ||
else | else | ||
hg clone -r default | hg clone -r default https://hg.mozilla.org/releases/l10n/mozilla-$channel/$loc $CLONE | ||
fi | fi | ||
done | done | ||
Line 27: | Line 27: | ||
</nowiki></pre> | </nowiki></pre> | ||
Then, enable Axel's merge helper extension to hg: | |||
hg clone https://hg.mozilla.org/users/axel_mozilla.com/branch-l10n/ ~/src/branch-l10n | |||
hg clone | |||
Edit your ~/.hgrc accordingly: | Edit your ~/.hgrc accordingly: | ||
Line 43: | Line 41: | ||
hg help no-op-merge | hg help no-op-merge | ||
If | There's also a test-suite in branch-l10n, which you can run to verify your version of mercurial works. | ||
cd ~/src/branch-l10n/ | |||
python test.py | |||
If the extension works, you can proceed with the merge | |||
== Merge == | |||
Have LOCS set. Also, make sure ssh works for hg, we're pulling over https to speed things up. | |||
The actual merge wants to happen closely to/after the en-US merge and its push to beta. | |||
First, visit the l10n dashboard, and migrate the database. Adjust the time to just before the push to beta of en-US. Or either, if aurora at one point was pushed first. The page is https://l10n.mozilla.org/shipping/release/. Also, on that page, switch off `fallback` for Lightning. | |||
<pre style="overflow-x:scroll">cd releases/l10n | |||
for loc in $LOCS; do | |||
hg -R mozilla-beta/$loc pull -u -r default | |||
hg -R mozilla-aurora/$loc pull -u -r default | |||
hg -R mozilla-beta/$loc no-op-merge -m"Migrating aurora to beta for Firefox XXX" $PWD/mozilla-aurora/$loc mozilla-beta/$loc | |||
hg push -R mozilla-beta/$loc -r default ssh://hg.mozilla.org/releases/l10n/mozilla-aurora/$loc | |||
hg push -R mozilla-beta/$loc -r default ssh://hg.mozilla.org/releases/l10n/mozilla-beta/$loc | |||
done | |||
</pre> | |||
This goes through all locales, does a final pull, does the no-op-merge, and pushes to aurora, and then beta. That way, you minimize the time when commits can create heads. |