aboutsummaryrefslogtreecommitdiffstats
path: root/libbe/bzr.py
diff options
context:
space:
mode:
authorAaron Bentley <abentley@panoramicfeedback.com>2006-02-03 16:00:26 -0500
committerAaron Bentley <abentley@panoramicfeedback.com>2006-02-03 16:00:26 -0500
commitd9214fa60ea080bd10641bac61c962827d181552 (patch)
treef3743932662ab28316ec6aa1eda7e9721ae42c73 /libbe/bzr.py
parent66abb87cf229971b3dcc0781d83bbddeb8c0604f (diff)
downloadbugseverywhere-d9214fa60ea080bd10641bac61c962827d181552.tar.gz
Fixed merge change detection
Diffstat (limited to 'libbe/bzr.py')
-rw-r--r--libbe/bzr.py4
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"