From c70e9a670242a6eefb12dbdb857a8ab88d71521d Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Tue, 4 Oct 2016 17:19:32 +0300
Subject: [PATCH] Create special parameter for branch version auto-increment

Can be used when bootstrap branch differs from the one used for auto-increment.

Auto-increment is guarded by branch parameter to avoid accidental enabling after branches auto-merge.

(cherry picked from commit 46791a3)
---
 update_dependencies.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/update_dependencies.xml b/update_dependencies.xml
index 003e0c76451..ef606258959 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -21,7 +21,8 @@
 
     <!-- Uncomment to enable force version increment in branch. Set override.version.disabled to temporary disable feature without commits -->
     <!--
-    <property name="override.version.url" value="https://teamcity.jetbrains.com/guestAuth/app/rest/builds/?locator=buildType:bt345,count:1${kotlin.bootstrap.branch.locator}"/>
+    <property name="override.version.branch" value="${kotlin.bootstrap.branch.locator}"/>
+    <property name="override.version.url" value="https://teamcity.jetbrains.com/guestAuth/app/rest/builds/?locator=buildType:bt345,count:1,branch:${override.version.branch}"/>
     -->
     <!--<property name="override.version.disabled" value="true"/>-->
 
@@ -971,7 +972,7 @@
         <condition property="need.version.override">
             <and>
                 <isset property="override.version.url"/>
-                <equals arg1="${kotlin.bootstrap.branch}" arg2="${teamcity.build.branch}"/>
+                <equals arg1="${override.version.branch}" arg2="${teamcity.build.branch}"/>
                 <not>
                     <isset property="override.version.disabled"/>
                 </not>