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.branching/branch-works-anywhere.stdout | |
| 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.branching/branch-works-anywhere.stdout')
| -rw-r--r-- | tests.branching/branch-works-anywhere.stdout | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/tests.branching/branch-works-anywhere.stdout b/tests.branching/branch-works-anywhere.stdout index 484fee45..3470a804 100644 --- a/tests.branching/branch-works-anywhere.stdout +++ b/tests.branching/branch-works-anywhere.stdout @@ -6,11 +6,11 @@ d ./.morph/cache/gits d ./.morph/cache/gits/file_morphs d ./branch1 d ./branch1/.morph-system-branch -d ./branch1/baserock:morphs -d ./branch1/baserock:morphs/.git +d ./branch1/test:morphs +d ./branch1/test:morphs/.git f ./branch1/.morph-system-branch/config -f ./branch1/baserock:morphs/hello-stratum.morph -f ./branch1/baserock:morphs/hello-system.morph +f ./branch1/test:morphs/hello-stratum.morph +f ./branch1/test:morphs/hello-system.morph Workspace after creating the second branch: d . d ./.morph @@ -19,18 +19,18 @@ d ./.morph/cache/gits d ./.morph/cache/gits/file_morphs d ./branch1 d ./branch1/.morph-system-branch -d ./branch1/baserock:morphs -d ./branch1/baserock:morphs/.git +d ./branch1/test:morphs +d ./branch1/test:morphs/.git d ./branch2 d ./branch2/.morph-system-branch -d ./branch2/baserock:morphs -d ./branch2/baserock:morphs/.git +d ./branch2/test:morphs +d ./branch2/test:morphs/.git f ./branch1/.morph-system-branch/config -f ./branch1/baserock:morphs/hello-stratum.morph -f ./branch1/baserock:morphs/hello-system.morph +f ./branch1/test:morphs/hello-stratum.morph +f ./branch1/test:morphs/hello-system.morph f ./branch2/.morph-system-branch/config -f ./branch2/baserock:morphs/hello-stratum.morph -f ./branch2/baserock:morphs/hello-system.morph +f ./branch2/test:morphs/hello-stratum.morph +f ./branch2/test:morphs/hello-system.morph Workspace after creating the third branch: d . d ./.morph @@ -39,25 +39,25 @@ d ./.morph/cache/gits d ./.morph/cache/gits/file_morphs d ./branch1 d ./branch1/.morph-system-branch -d ./branch1/baserock:morphs -d ./branch1/baserock:morphs/.git +d ./branch1/test:morphs +d ./branch1/test:morphs/.git d ./branch2 d ./branch2/.morph-system-branch -d ./branch2/baserock:morphs -d ./branch2/baserock:morphs/.git +d ./branch2/test:morphs +d ./branch2/test:morphs/.git d ./branch3 d ./branch3/.morph-system-branch -d ./branch3/baserock:morphs -d ./branch3/baserock:morphs/.git +d ./branch3/test:morphs +d ./branch3/test:morphs/.git f ./branch1/.morph-system-branch/config -f ./branch1/baserock:morphs/hello-stratum.morph -f ./branch1/baserock:morphs/hello-system.morph +f ./branch1/test:morphs/hello-stratum.morph +f ./branch1/test:morphs/hello-system.morph f ./branch2/.morph-system-branch/config -f ./branch2/baserock:morphs/hello-stratum.morph -f ./branch2/baserock:morphs/hello-system.morph +f ./branch2/test:morphs/hello-stratum.morph +f ./branch2/test:morphs/hello-system.morph f ./branch3/.morph-system-branch/config -f ./branch3/baserock:morphs/hello-stratum.morph -f ./branch3/baserock:morphs/hello-system.morph +f ./branch3/test:morphs/hello-stratum.morph +f ./branch3/test:morphs/hello-system.morph Workspace after creating the fourth branch: d . d ./.morph @@ -66,29 +66,29 @@ d ./.morph/cache/gits d ./.morph/cache/gits/file_morphs d ./branch1 d ./branch1/.morph-system-branch -d ./branch1/baserock:morphs -d ./branch1/baserock:morphs/.git +d ./branch1/test:morphs +d ./branch1/test:morphs/.git d ./branch2 d ./branch2/.morph-system-branch -d ./branch2/baserock:morphs -d ./branch2/baserock:morphs/.git +d ./branch2/test:morphs +d ./branch2/test:morphs/.git d ./branch3 d ./branch3/.morph-system-branch -d ./branch3/baserock:morphs -d ./branch3/baserock:morphs/.git +d ./branch3/test:morphs +d ./branch3/test:morphs/.git d ./branch4 d ./branch4/.morph-system-branch -d ./branch4/baserock:morphs -d ./branch4/baserock:morphs/.git +d ./branch4/test:morphs +d ./branch4/test:morphs/.git f ./branch1/.morph-system-branch/config -f ./branch1/baserock:morphs/hello-stratum.morph -f ./branch1/baserock:morphs/hello-system.morph +f ./branch1/test:morphs/hello-stratum.morph +f ./branch1/test:morphs/hello-system.morph f ./branch2/.morph-system-branch/config -f ./branch2/baserock:morphs/hello-stratum.morph -f ./branch2/baserock:morphs/hello-system.morph +f ./branch2/test:morphs/hello-stratum.morph +f ./branch2/test:morphs/hello-system.morph f ./branch3/.morph-system-branch/config -f ./branch3/baserock:morphs/hello-stratum.morph -f ./branch3/baserock:morphs/hello-system.morph +f ./branch3/test:morphs/hello-stratum.morph +f ./branch3/test:morphs/hello-system.morph f ./branch4/.morph-system-branch/config -f ./branch4/baserock:morphs/hello-stratum.morph -f ./branch4/baserock:morphs/hello-system.morph +f ./branch4/test:morphs/hello-stratum.morph +f ./branch4/test:morphs/hello-system.morph |