summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2013-10-30 09:59:09 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2013-10-31 12:29:52 +0000
commit460227f17e01f9072b72062fae84f226133ec04c (patch)
treea441e8b244d569e6e346c66cf9149c93cb1f3454
parent6d69eb0295f7d51399d8f341444bfcf90f6b0bb5 (diff)
downloadmorph-460227f17e01f9072b72062fae84f226133ec04c.tar.gz
Don't remove an existing branch in 'morph branch'
-rw-r--r--morphlib/plugins/branch_and_merge_new_plugin.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/morphlib/plugins/branch_and_merge_new_plugin.py b/morphlib/plugins/branch_and_merge_new_plugin.py
index 9a0ee484..dba529d9 100644
--- a/morphlib/plugins/branch_and_merge_new_plugin.py
+++ b/morphlib/plugins/branch_and_merge_new_plugin.py
@@ -134,6 +134,9 @@ class SimpleBranchAndMergePlugin(cliapp.Plugin):
gd.update_submodules(self.app)
gd.update_remotes()
+ except morphlib.sysbranchdir.SystemBranchDirectoryAlreadyExists as e:
+ logging.error('Caught exception: %s' % str(e))
+ raise
except BaseException as e:
# Oops. Clean up.
logging.error('Caught exception: %s' % str(e))