canmove, Confirmed users
1,448
edits
L10n:Migration: Difference between revisions
→Merge
(→Merge) |
|||
| Line 43: | Line 43: | ||
== Merge == | == Merge == | ||
First, enable Axel's merge helper extension to hg: | |||
hg clone http://hg.mozilla.org/users/axel_mozilla.com/branch-l10n/ ~/src/branch-l10n | |||
Edit your ~/.hgrc accordingly: | |||
[extensions] | |||
... | |||
merge-l10n = ~/src/branch-l10n/merge_l10n.py | |||
Try it out with: | |||
hg help no-op-merge | |||
If it shows the help screen, you can proceed with the merge | |||
cd releases/ | cd releases/ | ||
for loc in `cat mozilla-*a/browser/locales/shipped-locales|awk '{print $1;}'|sort|uniq`; do hg -R l10n/mozilla-beta/$loc no-op-merge -m"Migrating aurora to beta for Firefox 7" $PWD/l10n/mozilla-aurora/$loc; done | for loc in `cat mozilla-*a/browser/locales/shipped-locales|awk '{print $1;}'|sort|uniq`; do hg -R l10n/mozilla-beta/$loc no-op-merge -m"Migrating aurora to beta for Firefox 7" $PWD/l10n/mozilla-aurora/$loc; done | ||