From 460227f17e01f9072b72062fae84f226133ec04c Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Wed, 30 Oct 2013 09:59:09 +0000 Subject: Don't remove an existing branch in 'morph branch' --- morphlib/plugins/branch_and_merge_new_plugin.py | 3 +++ 1 file changed, 3 insertions(+) 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)) -- cgit v1.2.1