Correctly interpret the "no merge location" message from bzr 0.7.

diff --git a/libbe/bzr.py b/libbe/bzr.py
index 7aa6a58430033d37a3039cfdd5e3e522ee041469..b53429ce266d322ad118e596b612b714a4c27eee 100644 (file)
--- a/libbe/bzr.py
+++ b/libbe/bzr.py
@@ -121,7 +121,8 @@ def postcommit(directory):
     try:
         invoke_client('merge', directory=directory)
     except CommandError, e:
-        if 'No merge branch known or specified' in e.err_str:
+        if ('No merge branch known or specified' in e.err_str or
+            'No merge location known or specified' in e.err_str):
             pass
         else:
             status = invoke_client('revert',  '--no-backup',