summaryrefslogtreecommitdiff
path: root/tests.branching/checkout-works-anywhere.stdout
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2012-11-07 15:51:01 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2012-11-07 18:53:48 +0000
commitb599757873d5f05e82647287dfd1387f2426e5c5 (patch)
tree45813def262ff7d58b0e3c9564670fd0907d9ff7 /tests.branching/checkout-works-anywhere.stdout
parent25067e0ff261577da0ace26126c01e2829d7e5b7 (diff)
downloadmorph-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.branching/checkout-works-anywhere.stdout')
-rw-r--r--tests.branching/checkout-works-anywhere.stdout24
1 files changed, 12 insertions, 12 deletions
diff --git a/tests.branching/checkout-works-anywhere.stdout b/tests.branching/checkout-works-anywhere.stdout
index e8171473..6e82072a 100644
--- a/tests.branching/checkout-works-anywhere.stdout
+++ b/tests.branching/checkout-works-anywhere.stdout
@@ -6,11 +6,11 @@ d ./.morph/cache/gits
d ./.morph/cache/gits/file_morphs
d ./master
d ./master/.morph-system-branch
-d ./master/baserock:morphs
-d ./master/baserock:morphs/.git
+d ./master/test:morphs
+d ./master/test:morphs/.git
f ./master/.morph-system-branch/config
-f ./master/baserock:morphs/hello-stratum.morph
-f ./master/baserock:morphs/hello-system.morph
+f ./master/test:morphs/hello-stratum.morph
+f ./master/test:morphs/hello-system.morph
Workspace after checking out master from within a new branch:
d .
d ./.morph
@@ -19,15 +19,15 @@ d ./.morph/cache/gits
d ./.morph/cache/gits/file_morphs
d ./master
d ./master/.morph-system-branch
-d ./master/baserock:morphs
-d ./master/baserock:morphs/.git
+d ./master/test:morphs
+d ./master/test:morphs/.git
d ./newbranch
d ./newbranch/.morph-system-branch
-d ./newbranch/baserock:morphs
-d ./newbranch/baserock:morphs/.git
+d ./newbranch/test:morphs
+d ./newbranch/test:morphs/.git
f ./master/.morph-system-branch/config
-f ./master/baserock:morphs/hello-stratum.morph
-f ./master/baserock:morphs/hello-system.morph
+f ./master/test:morphs/hello-stratum.morph
+f ./master/test:morphs/hello-system.morph
f ./newbranch/.morph-system-branch/config
-f ./newbranch/baserock:morphs/hello-stratum.morph
-f ./newbranch/baserock:morphs/hello-system.morph
+f ./newbranch/test:morphs/hello-stratum.morph
+f ./newbranch/test:morphs/hello-system.morph