Merge pull request cms-sw#208 from nclopezo/update-auto-merge-branches

Added automatic merge for 7_4_X in cmssw and cmsdist
makortel · Nov 24, 2014 · 210c71d · 210c71d
2 parents b98e56f + 86d198d
commit 210c71d
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/auto-update-git-branches b/auto-update-git-branches
@@ -49,6 +49,9 @@ updateBranch CMSSW_7_3_X CMSSW_7_3_THREADED_X
 updateBranch CMSSW_7_3_X CMSSW_7_3_CLANG_X
 updateBranch CMSSW_7_3_X CMSSW_7_3_DEVEL_X
 
+# CMSSW_7_4_X
+updateBranch CMSSW_7_3_X CMSSW_7_4_X
+
 # Update CMSDIST
 cd $WORKSPACE
 if [ ! -d cmsdist ]; then
@@ -90,3 +93,10 @@ updateBranch IB/CMSSW_7_3_X/stable IB/CMSSW_7_3_X/asan
 updateBranch IB/CMSSW_7_3_X/stable IB/CMSSW_7_3_X/geant10
 updateBranch IB/CMSSW_7_3_X/stable IB/CMSSW_7_3_X/next
 updateBranch IB/CMSSW_7_3_X/stable IB/CMSSW_7_3_X/debug
+
+# CMSSW_7_4_X
+# Since the production arch for 74X is gcc491, IB/CMSSW_7_3_X/491
+# merges into IB/CMSSW_7_4_X/stable Then it merges into the
+# other cmsdist branches for 74X as usual
+updateBranch IB/CMSSW_7_3_X/gcc491 IB/CMSSW_7_4_X/stable
+updateBranch IB/CMSSW_7_4_X/stable IB/CMSSW_7_4_X/gcc481