diff options
author | Aaron Bentley <abentley@panoramicfeedback.com> | 2006-02-03 16:01:06 -0500 |
---|---|---|
committer | Aaron Bentley <abentley@panoramicfeedback.com> | 2006-02-03 16:01:06 -0500 |
commit | cf6feb832a71d5ef1a0453c1b94e72ab78836bc5 (patch) | |
tree | fe29612412bd8b600174df2a8d37817bd7e78d5a /libbe/bzr.py | |
parent | 57e25d6bd106dbc778a383d0ab4495652adae217 (diff) | |
parent | d9214fa60ea080bd10641bac61c962827d181552 (diff) | |
download | bugseverywhere-cf6feb832a71d5ef1a0453c1b94e72ab78836bc5.tar.gz |
Merge from upstream
Diffstat (limited to 'libbe/bzr.py')
-rw-r--r-- | libbe/bzr.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libbe/bzr.py b/libbe/bzr.py index c6fc622..d68776d 100644 --- a/libbe/bzr.py +++ b/libbe/bzr.py @@ -118,12 +118,12 @@ def commit(directory, summary, body=None): def postcommit(directory): try: - status = invoke_client('merge', directory=directory) + invoke_client('merge', directory=directory) except CommandError: status = invoke_client('revert --no-backup', directory=directory) status = invoke_client('resolve --all', directory=directory) raise - if status == 1: + if len(invoke_client('status', directory=directory)[1]) > 0: commit(directory, 'Merge from upstream') name = "bzr" |