diff options
Diffstat (limited to 'libbe/bzr.py')
| -rw-r--r-- | libbe/bzr.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libbe/bzr.py b/libbe/bzr.py index 045395d..7aa6a58 100644 --- a/libbe/bzr.py +++ b/libbe/bzr.py @@ -120,10 +120,14 @@ def commit(directory, summary, body=None): def postcommit(directory): try: invoke_client('merge', directory=directory) - except CommandError: - status = invoke_client('revert --no-backup', directory=directory) - status = invoke_client('resolve --all', directory=directory) - raise + except CommandError, e: + if 'No merge branch known or specified' in e.err_str: + pass + else: + status = invoke_client('revert', '--no-backup', + directory=directory) + status = invoke_client('resolve', '--all', directory=directory) + raise if len(invoke_client('status', directory=directory)[1]) > 0: commit(directory, 'Merge from upstream') |