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-checkouts-existing-chunk.script | |
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-checkouts-existing-chunk.script')
-rwxr-xr-x | tests.branching/edit-checkouts-existing-chunk.script | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests.branching/edit-checkouts-existing-chunk.script b/tests.branching/edit-checkouts-existing-chunk.script index 1c8e66cd..bc1650b7 100755 --- a/tests.branching/edit-checkouts-existing-chunk.script +++ b/tests.branching/edit-checkouts-existing-chunk.script @@ -26,8 +26,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" checkout baserock:morphs alfred # Edit the hello chunk in alfred. -cd alfred/baserock:morphs -"$SRCDIR/scripts/test-morph" edit baserock:hello alfred +"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello echo "Current branches, morphs:" "$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/alfred/baserock:morphs" branch |