diff options
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 3a00015b..40f3cc4a 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" edit hello-system hello-stratum hello +"$SRCDIR/scripts/test-morph" new-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" edit hello-system hello-stratum hello +"$SRCDIR/scripts/test-morph" new-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 ba759fa3..5fa13130 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" edit hello-system hello-stratum +"$SRCDIR/scripts/test-morph" new-edit hello-system hello-stratum cd baserock/newbranch/test:morphs sed -e 's/"morph": "hello-stratum"/"morph": "goodbye-stratum"/'\ |