aboutsummaryrefslogtreecommitdiffstats
path: root/libbe/bzr.py
diff options
context:
space:
mode:
authorAaron Bentley <abentley@panoramicfeedback.com>2006-03-31 15:27:34 -0500
committerAaron Bentley <abentley@panoramicfeedback.com>2006-03-31 15:27:34 -0500
commit69dd4954ad4007709d1c0fa0a3e38be27d28ca0a (patch)
tree758933659178e46e54eec234418aeb6dddf307f2 /libbe/bzr.py
parenta96d11f9db6fb4f54bf95b353a531ecf82a84381 (diff)
downloadbugseverywhere-69dd4954ad4007709d1c0fa0a3e38be27d28ca0a.tar.gz
Dirty fix for new-comments not writing bug
Diffstat (limited to 'libbe/bzr.py')
-rw-r--r--libbe/bzr.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/libbe/bzr.py b/libbe/bzr.py
index 045395d..7aa6a58 100644
--- a/libbe/bzr.py
+++ b/libbe/bzr.py
@@ -120,10 +120,14 @@ def commit(directory, summary, body=None):
def postcommit(directory):
try:
invoke_client('merge', directory=directory)
- except CommandError:
- status = invoke_client('revert --no-backup', directory=directory)
- status = invoke_client('resolve --all', directory=directory)
- raise
+ except CommandError, e:
+ if 'No merge branch known or specified' in e.err_str:
+ pass
+ else:
+ status = invoke_client('revert', '--no-backup',
+ directory=directory)
+ status = invoke_client('resolve', '--all', directory=directory)
+ raise
if len(invoke_client('status', directory=directory)[1]) > 0:
commit(directory, 'Merge from upstream')