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.merging | |
| 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.merging')
| -rwxr-xr-x | tests.merging/move-chunk-repo.script | 4 | ||||
| -rwxr-xr-x | tests.merging/rename-stratum.script | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests.merging/move-chunk-repo.script b/tests.merging/move-chunk-repo.script index 40f3cc4a..3a00015b 100755 --- a/tests.merging/move-chunk-repo.script +++ b/tests.merging/move-chunk-repo.script @@ -26,7 +26,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" branch test:morphs baserock/newbranch -"$SRCDIR/scripts/test-morph" new-edit hello-system hello-stratum hello +"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello # Chunk moves to a new location (we manually update the ref back to master # here, so 'morph edit' can create a system branch in the new repo from it). @@ -38,7 +38,7 @@ sed -e 's/"repo": "test:hello"/"repo": "test:hello-lorried"/' \ git commit -q --all -m "'hello' repository has moved" # Now we further edit the chunk, just for fun. -"$SRCDIR/scripts/test-morph" new-edit hello-system hello-stratum hello +"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello cd "$DATADIR/workspace/baserock/newbranch/test:hello-lorried" touch newfile.txt git add newfile.txt diff --git a/tests.merging/rename-stratum.script b/tests.merging/rename-stratum.script index 5fa13130..ba759fa3 100755 --- a/tests.merging/rename-stratum.script +++ b/tests.merging/rename-stratum.script @@ -31,7 +31,7 @@ cd "$DATADIR/workspace" # associate hello-stratum and goodbye-stratum at all. # Rename the stratum -"$SRCDIR/scripts/test-morph" new-edit hello-system hello-stratum +"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum cd baserock/newbranch/test:morphs sed -e 's/"morph": "hello-stratum"/"morph": "goodbye-stratum"/'\ |