Increment branch build number on stabilize branch.
BUG=chromium-os:24375
TEST=None
(cherry picked from commit 5a81bac4debb2bf2713a36bd88ca96e8094e47b5)
diff --git a/buildbot/cbuildbot_stages.py b/buildbot/cbuildbot_stages.py
index c6ef2ba..b376de3 100644
--- a/buildbot/cbuildbot_stages.py
+++ b/buildbot/cbuildbot_stages.py
@@ -157,7 +157,11 @@
def InitializeManifestManager(self):
"""Initializes a manager that manages manifests for associated stages."""
- increment = 'build' if self._tracking_branch == 'master' else 'branch'
+ # On the master branch, increment the build number. On the stabilize
+ # branch, increment the patch number. For other branches, increment
+ # the branch build number.
+ _BRANCH_INCREMENT_TYPE = {'master': 'build', 'stabilize': 'patch'}
+ increment = _BRANCH_INCREMENT_TYPE.get(self._tracking_branch, 'branch')
dry_run = self._options.debug
source_repo = repository.RepoRepository(
