From b6b219d75ef63ca33a10cb6cd32dd9b1669ecfa8 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Wed, 28 Aug 2013 14:22:01 +0000 Subject: 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. --- tests.branching/edit-handles-submodules.script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests.branching/edit-handles-submodules.script') diff --git a/tests.branching/edit-handles-submodules.script b/tests.branching/edit-handles-submodules.script index 389784ed..72344119 100755 --- a/tests.branching/edit-handles-submodules.script +++ b/tests.branching/edit-handles-submodules.script @@ -26,7 +26,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" branch test:morphs newbranch # Submodules should be set up automatically -"$SRCDIR/scripts/test-morph" new-edit hello-system hello-stratum hello +"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello cd "$DATADIR/workspace/newbranch/test:hello" [ -e foolib/README ] -- cgit v1.2.1