258
edits
L10n:Migration: Difference between revisions
→Merge
(→Merge) |
(→Merge) |
||
| Line 65: | Line 65: | ||
hg -R mozilla-aurora/$loc pull -u -r default mozilla-beta/$loc | hg -R mozilla-aurora/$loc pull -u -r default mozilla-beta/$loc | ||
# specific for 51 on aurora: | # specific for 51 on aurora: | ||
hg --cwd mozilla-aurora/$loc rm toolkit/chrome/mozapps/help | if [ -d "mozilla-aurora/$loc/suite/chrome/common" ] | ||
then | |||
# Move files to SeaMonkey | |||
hg --cwd mozilla-aurora/$loc mv toolkit/chrome/mozapps/help suite/chrome/common/helpviewer | |||
hg --cwd mozilla-aurora/$loc ci -m'Bug 1290756 - Remove Help Viewer from Toolkit, move files to SeaMonkey' | |||
else | |||
# Remove folders if SeaMonkey is not available | |||
hg --cwd mozilla-aurora/$loc rm toolkit/chrome/mozapps/help | |||
hg --cwd mozilla-aurora/$loc ci -m'Bug 1290756 - Remove Help Viewer from Toolkit' | |||
fi | |||
done | done | ||
</pre> | </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. | 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. | ||