diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-05-03 16:25:01 +0100 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-05-04 14:30:00 +0100 |
| commit | 7a296203cec665731a0d83d34266b2c8ae770584 (patch) | |
| tree | 93302b63b031726a02aa584ec79fb4a137c461d2 /tests.branching | |
| parent | c6cad5a28df8c468a56887b374e16e925034575b (diff) | |
| download | morph-7a296203cec665731a0d83d34266b2c8ae770584.tar.gz | |
Use repo alias prefixes properly in tests
Diffstat (limited to 'tests.branching')
| -rwxr-xr-x | tests.branching/edit-checkouts-existing-chunk.script | 2 | ||||
| -rwxr-xr-x | tests.branching/edit-clones-chunk.script | 2 | ||||
| -rwxr-xr-x | tests.branching/merge-explicitly-named-repos.script | 6 | ||||
| -rwxr-xr-x | tests.branching/workflow.script | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/tests.branching/edit-checkouts-existing-chunk.script b/tests.branching/edit-checkouts-existing-chunk.script index 583f19e1..4e88ec7c 100755 --- a/tests.branching/edit-checkouts-existing-chunk.script +++ b/tests.branching/edit-checkouts-existing-chunk.script @@ -27,7 +27,7 @@ cd "$DATADIR/mine" # Edit the hello chunk in alfred. cd alfred/morphs -"$SRCDIR/scripts/test-morph" edit hello alfred +"$SRCDIR/scripts/test-morph" edit baserock:hello alfred echo "Current branches, morphs:" "$SRCDIR/scripts/run-git-in" "$DATADIR/mine/alfred/morphs" branch diff --git a/tests.branching/edit-clones-chunk.script b/tests.branching/edit-clones-chunk.script index f6f4e5e8..8b87b4d2 100755 --- a/tests.branching/edit-clones-chunk.script +++ b/tests.branching/edit-clones-chunk.script @@ -27,7 +27,7 @@ cd "$DATADIR/mine" # Edit chunk. cd newbranch/morphs -"$SRCDIR/scripts/test-morph" edit hello master +"$SRCDIR/scripts/test-morph" edit baserock:hello master echo "Current branches, morphs:" "$SRCDIR/scripts/run-git-in" "$DATADIR/mine/newbranch/morphs" branch diff --git a/tests.branching/merge-explicitly-named-repos.script b/tests.branching/merge-explicitly-named-repos.script index de6ecebc..48705f8a 100755 --- a/tests.branching/merge-explicitly-named-repos.script +++ b/tests.branching/merge-explicitly-named-repos.script @@ -28,7 +28,7 @@ cd "$DATADIR/mine" # Make a change to a chunk. cd newbranch/morphs -"$SRCDIR/scripts/test-morph" edit hello master +"$SRCDIR/scripts/test-morph" edit baserock:hello master cd ../hello touch newfile.txt git add newfile.txt @@ -38,8 +38,8 @@ git commit -m foo --quiet cd "$DATADIR/mine" "$SRCDIR/scripts/test-morph" branch otherbranch cd otherbranch/morphs -"$SRCDIR/scripts/test-morph" edit hello master -"$SRCDIR/scripts/test-morph" merge newbranch hello +"$SRCDIR/scripts/test-morph" edit baserock:hello master +"$SRCDIR/scripts/test-morph" merge newbranch baserock:hello # Check results. cd ../hello diff --git a/tests.branching/workflow.script b/tests.branching/workflow.script index d2ce374f..6a365d8e 100755 --- a/tests.branching/workflow.script +++ b/tests.branching/workflow.script @@ -25,7 +25,7 @@ cd "$DATADIR/mine" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" branch me/readme-fix cd me/readme-fix/morphs -"$SRCDIR/scripts/test-morph" edit hello master +"$SRCDIR/scripts/test-morph" edit baserock:hello master cd ../hello echo > README yoyoyo git add README @@ -34,6 +34,6 @@ git commit -m "Fix README, yo!" --quiet cd "$DATADIR/mine" "$SRCDIR/scripts/test-morph" checkout master cd master/morphs -"$SRCDIR/scripts/test-morph" edit hello master +"$SRCDIR/scripts/test-morph" edit baserock:hello master "$SRCDIR/scripts/test-morph" merge me/readme-fix hello |