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/conflict-morphology-kind.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/conflict-morphology-kind.script')
| -rwxr-xr-x | tests.merging/conflict-morphology-kind.script | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests.merging/conflict-morphology-kind.script b/tests.merging/conflict-morphology-kind.script index d8fcc6ef..235d8130 100755 --- a/tests.merging/conflict-morphology-kind.script +++ b/tests.merging/conflict-morphology-kind.script @@ -20,13 +20,13 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master -"$SRCDIR/scripts/test-morph" branch baserock:morphs test/unmergable +"$SRCDIR/scripts/test-morph" checkout test:morphs master +"$SRCDIR/scripts/test-morph" branch test:morphs test/unmergable -cd "$DATADIR/workspace/test/unmergable/baserock:morphs" +cd "$DATADIR/workspace/test/unmergable/test:morphs" "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum sed -ie 's/"kind": "stratum"/"kind": "chunk"/' hello-stratum.morph git commit --quiet --all -m "Unmergeable because kind has changed" -cd "$DATADIR/workspace/master/baserock:morphs" +cd "$DATADIR/workspace/master/test:morphs" "$SRCDIR/scripts/test-morph" merge test/unmergable |