From: Aaron Bentley <abentley@panoramicfeedback.com>
Date: Fri, 3 Feb 2006 21:00:26 +0000 (-0500)
Subject: Fixed merge change detection
X-Git-Tag: 1.0.0~222
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d9214fa60ea080bd10641bac61c962827d181552;p=be.git

Fixed merge change detection
---

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"