From: Marien Zwart <marienz@gentoo.org>
Date: Wed, 5 Apr 2006 16:12:35 +0000 (+0200)
Subject: Correctly interpret the "no merge location" message from bzr 0.7.
X-Git-Tag: 1.0.0~198^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=28dd7abe5900cf3f16e62f3641fd62040764fad8;p=be.git

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

diff --git a/libbe/bzr.py b/libbe/bzr.py
index 7aa6a58..b53429c 100644
--- 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',