| Index: dev-tools/scripts/scriptutil.py |
| IDEA additional info: |
| Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP |
| <+>UTF-8 |
| =================================================================== |
| --- dev-tools/scripts/scriptutil.py (revision aec11ebcf245daa37f7e81caaf16f6b93c604164) |
| +++ dev-tools/scripts/scriptutil.py (revision ) |
| @@ -107,9 +107,9 @@ |
| |
| if branchName == b'master': |
| return 'master' |
| - if branchName.startswith(b'branch_'): |
| + if re.match(r'branch_(\d+)x', branchName.decode('UTF-8')): |
| return 'stable' |
| - if branchName.startswith(b'lucene_solr_'): |
| + if re.match(r'branch_(\d+)_(\d+)', branchName.decode('UTF-8')): |
| return 'release' |
| raise Exception('Cannot run bumpVersion.py on feature branch') |
| |
