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/edit-updates-stratum.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/edit-updates-stratum.script')
-rwxr-xr-x | tests.branching/edit-updates-stratum.script | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests.branching/edit-updates-stratum.script b/tests.branching/edit-updates-stratum.script index 84974765..bfe16c8b 100755 --- a/tests.branching/edit-updates-stratum.script +++ b/tests.branching/edit-updates-stratum.script @@ -26,7 +26,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" branch test:morphs newbranch # Edit chunk. -"$SRCDIR/scripts/test-morph" new-edit hello-system hello-stratum hello +"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello # See what effect the editing had. "$SRCDIR/scripts/run-git-in" "newbranch/test:morphs" diff |