| Index: recipe_modules/bot_update/resources/bot_update.py
|
| diff --git a/recipe_modules/bot_update/resources/bot_update.py b/recipe_modules/bot_update/resources/bot_update.py
|
| index dc8d12fa293f44efe854e07aeb1fa0e5ac1b971a..044f0838f266018a443ba0e1fbad58a19f3998c6 100755
|
| --- a/recipe_modules/bot_update/resources/bot_update.py
|
| +++ b/recipe_modules/bot_update/resources/bot_update.py
|
| @@ -604,11 +604,7 @@
|
| try:
|
| ok = False
|
| git('checkout', '-b', temp_branch_name, cwd=root)
|
| - try:
|
| - git('rebase', base_rev, cwd=root)
|
| - finally:
|
| - # Abort the rebase since there were failures.
|
| - git('rebase', '--abort', cwd=root)
|
| + git('rebase', base_rev, cwd=root)
|
|
|
| # Get off of the temporary branch since it can't be deleted otherwise.
|
| cur_rev = git('rev-parse', 'HEAD', cwd=root).strip()
|
|
|