diff options
| author | Marien Zwart <marienz@gentoo.org> | 2006-04-05 18:12:35 +0200 |
|---|---|---|
| committer | Marien Zwart <marienz@gentoo.org> | 2006-04-05 18:12:35 +0200 |
| commit | 28dd7abe5900cf3f16e62f3641fd62040764fad8 (patch) | |
| tree | e2583f51a159215f74db2fce3fb0c898d9955f41 /libbe | |
| parent | 47f552ea663ccf37097051ed7c42ffaa754704dc (diff) | |
| download | bugseverywhere-28dd7abe5900cf3f16e62f3641fd62040764fad8.tar.gz | |
Correctly interpret the "no merge location" message from bzr 0.7.
Diffstat (limited to 'libbe')
| -rw-r--r-- | libbe/bzr.py | 3 |
1 files changed, 2 insertions, 1 deletions
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', |