651449 - Merge buildbot-configs changes made on production branch back to default

Status: RESOLVED FIXED

(Release Engineering :: General, defect, P2)

Description

[Rail Aliiev [:rail]]

Some of the changes in buildbot-configs made only on productoin branch, some of them will be important for preproduction testing.

For example at the moment we have not synced release configs, l10n changesets, some other configs.

I'm going to merge everything from production to default, except .hgtags.

Comment 1

[Rail Aliiev [:rail]]

To sync production and default I did the following

hg up production
echo "Merge from default" > /tmp/msg
echo  >> /tmp/msg
hg merge -P default >> /tmp/msg
hg merge default
hg commit -l /tmp/msg # see http://hg.mozilla.org/build/buildbot-configs/rev/2b20807deda3
hg up default
hg diff -X .hgtags -r default:production | hg import --no-commit -
# examine `hg diff`
hg commit -m "Merge from production" # See http://hg.mozilla.org/build/buildbot-configs/rev/e68aa87de7c3

# check the diff
$ hg diff -r production | lsdiff  
a/.hgtags

hg push