summaryrefslogtreecommitdiff
path: root/morphlib/plugins/branch_and_merge_plugin.py
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2013-09-02 13:37:53 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2013-09-05 14:27:55 +0000
commit4db444d0fc239eb74d11e8ebcfb50aa3e79ad500 (patch)
treecec477dea59ef17a47bc3146904766e198f6ef8f /morphlib/plugins/branch_and_merge_plugin.py
parent9ee503f122b12b0c1c57470ea9fb391d9079642a (diff)
downloadmorph-4db444d0fc239eb74d11e8ebcfb50aa3e79ad500.tar.gz
b&m: Re-implement morph petrify
This includes amending the test suite to use the old petrify, since the old unpetrify depends on some implementation details of it.
Diffstat (limited to 'morphlib/plugins/branch_and_merge_plugin.py')
-rw-r--r--morphlib/plugins/branch_and_merge_plugin.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py
index c1549a5d..4791989b 100644
--- a/morphlib/plugins/branch_and_merge_plugin.py
+++ b/morphlib/plugins/branch_and_merge_plugin.py
@@ -61,7 +61,7 @@ class BranchAndMergePlugin(cliapp.Plugin):
arg_synopsis='BRANCH')
# self.app.add_subcommand('edit', self.edit,
# arg_synopsis='SYSTEM STRATUM [CHUNK]')
- self.app.add_subcommand('petrify', self.petrify)
+ self.app.add_subcommand('old-petrify', self.petrify)
self.app.add_subcommand('unpetrify', self.unpetrify)
self.app.add_subcommand(
'tag', self.tag, arg_synopsis='TAG-NAME -- [GIT-COMMIT-ARG...]')