summaryrefslogtreecommitdiff
path: root/tests.branching/morph-repository-stored-in-cloned-repositories.script
diff options
context:
space:
mode:
authorJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-09-03 16:08:09 +0000
committerJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-09-04 16:17:09 +0000
commitbecff376751ea626567dba03fea75b6d153187d0 (patch)
tree3c18311b5a29922966c4a3c78b1e9f51423ccbfc /tests.branching/morph-repository-stored-in-cloned-repositories.script
parent65b8156aa2a0c86e8eb6d0d88e9f91c75b250960 (diff)
downloadmorph-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/morph-repository-stored-in-cloned-repositories.script')
-rwxr-xr-xtests.branching/morph-repository-stored-in-cloned-repositories.script2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests.branching/morph-repository-stored-in-cloned-repositories.script b/tests.branching/morph-repository-stored-in-cloned-repositories.script
index bfc5499b..5f5efa9e 100755
--- a/tests.branching/morph-repository-stored-in-cloned-repositories.script
+++ b/tests.branching/morph-repository-stored-in-cloned-repositories.script
@@ -40,7 +40,7 @@ git config morph.repository
echo
cd "$DATADIR/workspace/master"
-"$SRCDIR/scripts/test-morph" edit baserock:hello master
+"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello
echo "morph.repository of an edited repository:"
cd "$DATADIR/workspace/master/baserock:hello"