diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-11-07 15:51:01 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-11-07 18:53:48 +0000 |
| commit | b599757873d5f05e82647287dfd1387f2426e5c5 (patch) | |
| tree | 45813def262ff7d58b0e3c9564670fd0907d9ff7 /tests.merging/from-branch-not-checked-out.script | |
| parent | 25067e0ff261577da0ace26126c01e2829d7e5b7 (diff) | |
| download | morph-b599757873d5f05e82647287dfd1387f2426e5c5.tar.gz | |
tests: Use test: URL prefix instead of baserock: throughout
Some tests already used test: and in order to be able to share the
scripts/setup-3rd-party-strata script they need to all use the same
prefix.
Using baserock: implies that we are using real code from Baserock,
so I picked test: because the tests only ever use mock morphologies
and no real code.
Diffstat (limited to 'tests.merging/from-branch-not-checked-out.script')
| -rwxr-xr-x | tests.merging/from-branch-not-checked-out.script | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests.merging/from-branch-not-checked-out.script b/tests.merging/from-branch-not-checked-out.script index 2ead7f0f..a4661622 100755 --- a/tests.merging/from-branch-not-checked-out.script +++ b/tests.merging/from-branch-not-checked-out.script @@ -22,7 +22,7 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master +"$SRCDIR/scripts/test-morph" checkout test:morphs master cd master # 'From' branch is not checked out (and also doesn't exist, but that |