diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-08-08 17:13:27 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-08-14 16:32:29 +0000 |
commit | 5098d2da9e658bc02c867f296e08848eb4b37b8a (patch) | |
tree | 806476f3d7b2c49c1da2e3025dd4f1a58f0db96f /morphlib/plugins/branch_and_merge_plugin.py | |
parent | d3c10c7fe1b52a970984ed6b72fc8178eebac7f3 (diff) | |
download | morph-5098d2da9e658bc02c867f296e08848eb4b37b8a.tar.gz |
Re-implement "morph edit" using new infrastructure
Test suite currently fails because MorphologyLoader validates differently
from the old MorphologyFactory code, and because MorphSet changes refs
more correctly (including, it seems, build-dependency refs).
Diffstat (limited to 'morphlib/plugins/branch_and_merge_plugin.py')
-rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 62a9f925..38b882a0 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -59,8 +59,8 @@ class BranchAndMergePlugin(cliapp.Plugin): # User-facing commands self.app.add_subcommand('merge', self.merge, arg_synopsis='BRANCH') - self.app.add_subcommand('edit', self.edit, - arg_synopsis='SYSTEM STRATUM [CHUNK]') +# self.app.add_subcommand('edit', self.edit, +# arg_synopsis='SYSTEM STRATUM [CHUNK]') self.app.add_subcommand('petrify', self.petrify) self.app.add_subcommand('unpetrify', self.unpetrify) self.app.add_subcommand( |