diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-08-29 11:48:50 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-08-30 10:34:53 +0000 |
| commit | 2beadc4d94bd77e1794832c758b6174ff1ada0a6 (patch) | |
| tree | a4edb67ad6a7158517ad230acedba12cb9b27bac /morphlib | |
| parent | b0096f15bb3624207b1df71b22070b4780b03658 (diff) | |
| download | morph-2beadc4d94bd77e1794832c758b6174ff1ada0a6.tar.gz | |
edit: Unset defaults before writing
This also amends the test suite.
The git apply command to alter the stratum proved inflexible when
anything changed, so it has been replaced by a small in-line python
script.
Diffstat (limited to 'morphlib')
| -rw-r--r-- | morphlib/plugins/branch_and_merge_new_plugin.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/morphlib/plugins/branch_and_merge_new_plugin.py b/morphlib/plugins/branch_and_merge_new_plugin.py index 2099f20b..7c326e48 100644 --- a/morphlib/plugins/branch_and_merge_new_plugin.py +++ b/morphlib/plugins/branch_and_merge_new_plugin.py @@ -235,6 +235,7 @@ class SimpleBranchAndMergePlugin(cliapp.Plugin): logging.debug( 'Saving morphology: %s %s %s' % (morph.repo_url, morph.ref, morph.filename)) + loader.unset_defaults(morph) loader.save_to_file( sb.get_filename(morph.repo_url, morph.filename), morph) morph.dirty = False |