Bug 1671913 - Clean up what files ffxbld-merge should be able to change r=sheehan
authorJohan Lorenzo <jlorenzo@mozilla.com>
Mon, 19 Oct 2020 15:09:03 +0000
changeset 7622 8510c120695d0cced5235b01de108bf094d875cc
parent 7621 3d949575c04edb947bfe5c966b3d61056e6caf66
child 7623 811b8a34e7211ce5ffc60e44ae07064f73063bde
push id3800
push usercosheehan@mozilla.com
push dateMon, 19 Oct 2020 15:12:48 +0000
treeherderversion-control-tools@8510c120695d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssheehan
bugs1671913
Bug 1671913 - Clean up what files ffxbld-merge should be able to change r=sheehan Differential Revision: https://phabricator.services.mozilla.com/D94000
hghooks/mozhghooks/check/merge_day.py
--- a/hghooks/mozhghooks/check/merge_day.py
+++ b/hghooks/mozhghooks/check/merge_day.py
@@ -19,29 +19,22 @@ Merge day push contains unexpected chang
 
 
 ALLOWED_FILES = (
     b'.hgtags',
     b'CLOBBER',
     b'browser/config/mozconfigs/',
     b'browser/config/version.txt',
     b'browser/config/version_display.txt',
-    b'browser/confvars.sh',
+    b'browser/locales/l10n-changesets.json',
+    b'build/defines.sh',
     b'build/mozconfig.common',
     b'config/milestone.txt',
-    b'mobile/android/config/mozconfigs/',
     b'services/sync/modules/constants.js',
     b'xpcom/components/Module.h',
-    b'mobile/android/config/version-files/beta/version.txt',
-    b'mobile/android/config/version-files/beta/version_display.txt',
-    b'mobile/android/config/version-files/nightly/version.txt',
-    b'mobile/android/config/version-files/nightly/version_display.txt',
-    b'mobile/android/config/version-files/release/version.txt',
-    b'mobile/android/config/version-files/release/version_display.txt',
-
 )
 
 INVALID_PATH_FOUND = b"""
 ffxbld-merge can only push changes to
 the following paths:
 %s
 
 Illegal paths found: