diff options
| author | Aaron Bentley <aaron.bentley@utoronto.ca> | 2006-04-06 22:17:23 -0400 |
|---|---|---|
| committer | Aaron Bentley <aaron.bentley@utoronto.ca> | 2006-04-06 22:17:23 -0400 |
| commit | d3fbae175f0cf639cfe0957e216cccf9a95e009b (patch) | |
| tree | 3bbc6cd633181d543f47c24406d6b7b58c77350c /libbe/bzr.py | |
| parent | 64794faedd01c04cbb56ccbbe299d515d4edeefe (diff) | |
| parent | e312d44cc6967e18b21955c6d9658d4c04259a92 (diff) | |
| download | bugseverywhere-d3fbae175f0cf639cfe0957e216cccf9a95e009b.tar.gz | |
Merge remaining fixes from Zwart
Diffstat (limited to 'libbe/bzr.py')
| -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', |