diff options
author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-09-03 16:08:09 +0000 |
---|---|---|
committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-09-04 16:17:09 +0000 |
commit | becff376751ea626567dba03fea75b6d153187d0 (patch) | |
tree | 3c18311b5a29922966c4a3c78b1e9f51423ccbfc /tests.branching/edit-updates-stratum.stdout | |
parent | 65b8156aa2a0c86e8eb6d0d88e9f91c75b250960 (diff) | |
download | morph-becff376751ea626567dba03fea75b6d153187d0.tar.gz |
Rewrite edit command to expect SYSTEM STRATUM [CHUNK] parameters
Editing no longer requires a repository to be specified, neither does
it require a branch.
It now starts off from a system morphology that is required to exist
in the branch root repository. Relative to this system, "morph edit"
realises the repository of a stratum and, optionally, a chunk, creates
edit branches named after the system branch, if necessary, and update
the references in the system and stratum morphology accordingly.
The changes made to any of the repositories in the system branch
are not committed.
All existing changes are updated to work with this new input syntax
for "morph edit".
Diffstat (limited to 'tests.branching/edit-updates-stratum.stdout')
-rw-r--r-- | tests.branching/edit-updates-stratum.stdout | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/tests.branching/edit-updates-stratum.stdout b/tests.branching/edit-updates-stratum.stdout index 01c67858..c29f3a9e 100644 --- a/tests.branching/edit-updates-stratum.stdout +++ b/tests.branching/edit-updates-stratum.stdout @@ -24,3 +24,30 @@ index 006a96c..ad8c08b 100644 + "kind": "stratum", + "name": "hello-stratum" } +diff --git a/hello-system.morph b/hello-system.morph +index 8dbcf67..db4f1f2 100644 +--- a/hello-system.morph ++++ b/hello-system.morph +@@ -1,13 +1,14 @@ + { +- "name": "hello-system", +- "kind": "system", +- "system-kind": "syslinux-disk", +- "disk-size": "1G", ++ "build-system": "manual", ++ "disk-size": 1073741824, ++ "kind": "system", ++ "name": "hello-system", + "strata": [ + { +- "morph": "hello-stratum", +- "repo": "baserock:morphs", +- "ref": "master" ++ "morph": "hello-stratum", ++ "ref": "newbranch", ++ "repo": "baserock:morphs" + } +- ] ++ ], ++ "system-kind": "syslinux-disk" + } |