diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2014-08-12 18:09:13 +0100 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-08-12 18:09:13 +0100 |
commit | b2786c73c0f4d4b76f824e309598ce57065e30ab (patch) | |
tree | 1e18a61d37da2da8ba19ef39eae1265185a13e75 /doc/branching-merging-systems.mdwn | |
parent | 6241d4466599406e3ad0a176c70fcbecdfdd1b64 (diff) | |
parent | 0f9c9e2ff3c9afe00735fa986200ac5fdcc8f79e (diff) | |
download | morph-b2786c73c0f4d4b76f824e309598ce57065e30ab.tar.gz |
Merge branch 'baserock/richardmaw/misc-fixups'baserock/richardmaw/tmp
Reviewed-by: Daniel Silverstone
Reviewed-by: Pedro Alvarez
Diffstat (limited to 'doc/branching-merging-systems.mdwn')
-rw-r--r-- | doc/branching-merging-systems.mdwn | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/doc/branching-merging-systems.mdwn b/doc/branching-merging-systems.mdwn index c2e24d77..3bc19aab 100644 --- a/doc/branching-merging-systems.mdwn +++ b/doc/branching-merging-systems.mdwn @@ -129,7 +129,7 @@ Also, clone the `morphs` git repository inside the system branch directory. cd ~/baserock/liw/foo/morphs - morph petrify base-system.morph devel-system.morph + edit base-system.morph devel-system.morph git commit -a Modify the specified morphologies (or the stratum morphologies they @@ -225,36 +225,6 @@ it to exist instead. * Run `git checkout BRANCH` in the `morphs` repository. -Implementation: `morph petrify` --------------- - -Usage: - - morph petrify [MORPH]... - morph petrify --petrify-from-system FILE - -This needs to be run in the `morphs` git repository in a system branch. - -In the first form: - -* read each of the given morphologies; if the morphology is a system one, - follow references to stratum morphologies and process those instead -* in each stratum morphology, replace a reference to a chunk with the - absolute SHA-1: if the original reference was, say, `baserock/morph`, - get the SHA-1 of the current tip commit in that branch and replace - the reference in the morphology - -In the second form: - -* extract the system and stratum morphologies used in the system image file; - these are in a petrified form already -* copy the morphologies to the current working directory, overwriting the - files from git - -In either case, the results need to be committed (with normal git commands) -by the user. - - Implementation: `morph edit` -------------- |