From b599757873d5f05e82647287dfd1387f2426e5c5 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 7 Nov 2012 15:51:01 +0000 Subject: 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. --- tests.branching/workflow.script | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests.branching/workflow.script') diff --git a/tests.branching/workflow.script b/tests.branching/workflow.script index 68da4f4a..56415ce4 100755 --- a/tests.branching/workflow.script +++ b/tests.branching/workflow.script @@ -23,17 +23,17 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs me/readme-fix +"$SRCDIR/scripts/test-morph" branch test:morphs me/readme-fix "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello -cd me/readme-fix/baserock:hello +cd me/readme-fix/test:hello echo > README yoyoyo git add README git commit -m "Fix README, yo!" --quiet -cd ../baserock:morphs +cd ../test:morphs git commit --quiet --all -m "Commit changes for system branch" cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master +"$SRCDIR/scripts/test-morph" checkout test:morphs master cd master "$SRCDIR/scripts/test-morph" merge me/readme-fix -- cgit v1.2.1