From 4db444d0fc239eb74d11e8ebcfb50aa3e79ad500 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Mon, 2 Sep 2013 13:37:53 +0000 Subject: 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. --- morphlib/plugins/branch_and_merge_plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'morphlib/plugins/branch_and_merge_plugin.py') 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...]') -- cgit v1.2.1