diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2013-08-28 14:22:01 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-08-29 15:07:32 +0000 |
commit | b6b219d75ef63ca33a10cb6cd32dd9b1669ecfa8 (patch) | |
tree | 6eeb99eed605ef6c9944d2781ce57fed10361f10 /tests.branching/add-then-edit.script | |
parent | f3293ecbda184248ea370aa8a419968cb005ba03 (diff) | |
download | morph-b6b219d75ef63ca33a10cb6cd32dd9b1669ecfa8.tar.gz |
Revert "Merge branch 'liw/restore-old-cmds'"
This reverts commit 2dc382a2a9ae977b1158002cd2631ec5593959c1, reversing
changes made to 89a019af088ff62459699a6efdadf8ac8fe35dd9.
We decided to restore the old commands for the release, as we weren't
confident the new implementations were correct yet.
To gain that confidence we need to use them, so the old versions are no
longer available, and the new edit code is used when the edit subcommand
is invoked.
Doing so also requires the test suite to use the edit command instead of
new-edit.
Diffstat (limited to 'tests.branching/add-then-edit.script')
-rwxr-xr-x | tests.branching/add-then-edit.script | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests.branching/add-then-edit.script b/tests.branching/add-then-edit.script index cdb28fd2..d6a2270f 100755 --- a/tests.branching/add-then-edit.script +++ b/tests.branching/add-then-edit.script @@ -30,7 +30,7 @@ cd "me/add-then-edit" cd test:morphs ## Sub-optimally, to alter the stratum, you have to `morph edit` it first -"$SRCDIR/scripts/test-morph" new-edit hello-system hello-stratum +"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum git apply <<'EOF' diff --git a/hello-stratum.morph b/hello-stratum.morph @@ -50,7 +50,7 @@ index 3b7be17..c79a9af 100644 name: hello-stratum EOF -"$SRCDIR/scripts/test-morph" new-edit hello-system hello-stratum goodbye +"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum goodbye # check whether the stratum still contains the goodbye chunk grep -qFe goodbye hello-stratum.morph |