bug 988611 - update script based on ff 28; r=aki
authorHal Wine <hwine@mozilla.com>
Fri, 04 Apr 2014 14:46:13 -0700
changeset 373 c21f6a9520545556ebaa3d0751889cee70630f7b
parent 372 54747787e5616ae15441f956eb74132c69ea0402
child 374 2825976a562b13c2a73aeb2c9191757755cb7168
push id352
push userhwine@mozilla.com
push dateFri, 04 Apr 2014 21:47:30 +0000
reviewersaki
bugs988611
bug 988611 - update script based on ff 28; r=aki
releases-related/beta2release_l10n.sh
--- a/releases-related/beta2release_l10n.sh
+++ b/releases-related/beta2release_l10n.sh
@@ -1,13 +1,15 @@
 #!/bin/bash
 # from https://wiki.mozilla.org/Release:Release_Automation_on_Mercurial:Documentation#L10N_sync
 set -x
 set -e
 
+# if you choose to use your own credentials, you also have to change the
+# hg push line below.
 HG_USER="ffxbld <release@mozilla.com>"
 HG_HOST=hg.mozilla.org
 repo=mozilla-release
 release_repo_path=releases/l10n/mozilla-release
 beta_repo_path=releases/l10n/mozilla-beta
 wd=`pwd`/l10n
 
 mkdir -p $wd
@@ -30,16 +32,20 @@ for l in `wget -q -O- http://$HG_HOST/re
         hg -R $l up -C -r $beta_rev
         HGMERGE=true hg -R $l merge -r $release_rev
         hg -R $l revert -a -y --no-backup -r $beta_rev
         # okay if commit "fails" (it will if there is nothing to commit)
         ec=0
         hg -R $l commit -u "$HG_USER" -m "Merge from mozilla-beta. CLOSED TREE a=release" || ec=$? | tee -a merged_l10n_locales
         echo "Merge on locale '$l'; exit code '$ec'" >> merged_l10n_locales
     fi
-    hg -R $l diff -r $beta_rev -r default
     hg -R $l push -f -e "ssh -l ffxbld -i ~/.ssh/ffxbld_dsa" ssh://$HG_HOST/$release_repo_path/$l
 done
 
 if test -r merged_l10n_locales; then
+    # annecdotal reports of the merge not working correctly, however
+    # that was before the syntax, etc. was corrected. Do want to call
+    # attention to the list, just in case, until we have confidence in
+    # the automation. No manual corrections were needed for FF 28 (the
+    # first use of the corrected script).
     echo "The following locales needed merging:"
     cat merged_l10n_locales
 fi