| Index: tools/push-to-trunk/push_to_trunk.py
|
| diff --git a/tools/push-to-trunk/push_to_trunk.py b/tools/push-to-trunk/push_to_trunk.py
|
| index c05f7489a2bd201be92511ee111cc3f2029df87d..56375fe79b4bbb3dc679096bf6213e051c7ba948 100755
|
| --- a/tools/push-to-trunk/push_to_trunk.py
|
| +++ b/tools/push-to-trunk/push_to_trunk.py
|
| @@ -154,7 +154,7 @@ class IncrementVersion(Step):
|
|
|
| if SortingKey(self["trunk_version"]) < SortingKey(self["latest_version"]):
|
| # If the version on bleeding_edge is newer than on trunk, use it.
|
| - self.GitCheckoutFile(self.Config(VERSION_FILE), "master")
|
| + self.GitCheckoutFile(self.Config(VERSION_FILE), "svn/bleeding_edge")
|
| self.ReadAndPersistVersion()
|
|
|
| if self.Confirm(("Automatically increment BUILD_NUMBER? (Saying 'n' will "
|
|
|