Fixed merge change detection

diff --git a/libbe/bzr.py b/libbe/bzr.py
index c6fc6223e9cfa086b70a0fb71373f54aab3495e4..d68776d65c735860db64206a61e3702d3f0c423a 100644 (file)
--- 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"