diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-27 15:04:00 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-27 19:22:22 +0100 |
| commit | 0ed3a78cc41eeee63f96c3b8111f8cf473e2d962 (patch) | |
| tree | 87d750a8b014e8bf34b3da2b783d3e69baa8b214 /morphlib/plugins | |
| parent | fcf40483bfab8c902ff5c09214a8ca768303eb98 (diff) | |
| download | morph-0ed3a78cc41eeee63f96c3b8111f8cf473e2d962.tar.gz | |
morph merge: Set status on success
We print a bunch of stuff if conflicts are encountered, so we should make
it clear at the end whether ultimately they were all resolvable or not.
Diffstat (limited to 'morphlib/plugins')
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 468695d9..30f02fde 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -868,6 +868,8 @@ class BranchAndMergePlugin(cliapp.Plugin): msg = "Merge system branch '%s'" % from_branch self.app.runcmd(['git', 'commit', '--all', '-m%s' % msg], cwd=repo_dir) + + self.app.status(msg="Merge successful") except: for repo_dir in dirty_repo_dirs: self.reset_work_tree_safe(repo_dir) |