From 2c4752d71d35ec31221dcdab1289d2084936ccae Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Thu, 6 Mar 2014 17:20:06 +0000 Subject: Fix paths for chunk directories in cmdtests --- tests.branching/branch-works-anywhere.stdout | 90 +++++++++++++++------------- 1 file changed, 50 insertions(+), 40 deletions(-) (limited to 'tests.branching/branch-works-anywhere.stdout') diff --git a/tests.branching/branch-works-anywhere.stdout b/tests.branching/branch-works-anywhere.stdout index 0b59ce71..4e317902 100644 --- a/tests.branching/branch-works-anywhere.stdout +++ b/tests.branching/branch-works-anywhere.stdout @@ -3,80 +3,90 @@ d . d ./.morph d ./branch1 d ./branch1/.morph-system-branch -d ./branch1/test:morphs -d ./branch1/test:morphs/.git +d ./branch1/test +d ./branch1/test/morphs +d ./branch1/test/morphs/.git f ./branch1/.morph-system-branch/config -f ./branch1/test:morphs/hello-stratum.morph -f ./branch1/test: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 d ./branch1 d ./branch1/.morph-system-branch -d ./branch1/test:morphs -d ./branch1/test:morphs/.git +d ./branch1/test +d ./branch1/test/morphs +d ./branch1/test/morphs/.git d ./branch2 d ./branch2/.morph-system-branch -d ./branch2/test:morphs -d ./branch2/test:morphs/.git +d ./branch2/test +d ./branch2/test/morphs +d ./branch2/test/morphs/.git f ./branch1/.morph-system-branch/config -f ./branch1/test:morphs/hello-stratum.morph -f ./branch1/test: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/test:morphs/hello-stratum.morph -f ./branch2/test: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 d ./branch1 d ./branch1/.morph-system-branch -d ./branch1/test:morphs -d ./branch1/test:morphs/.git +d ./branch1/test +d ./branch1/test/morphs +d ./branch1/test/morphs/.git d ./branch2 d ./branch2/.morph-system-branch -d ./branch2/test:morphs -d ./branch2/test:morphs/.git +d ./branch2/test +d ./branch2/test/morphs +d ./branch2/test/morphs/.git d ./branch3 d ./branch3/.morph-system-branch -d ./branch3/test:morphs -d ./branch3/test:morphs/.git +d ./branch3/test +d ./branch3/test/morphs +d ./branch3/test/morphs/.git f ./branch1/.morph-system-branch/config -f ./branch1/test:morphs/hello-stratum.morph -f ./branch1/test: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/test:morphs/hello-stratum.morph -f ./branch2/test: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/test:morphs/hello-stratum.morph -f ./branch3/test: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 d ./branch1 d ./branch1/.morph-system-branch -d ./branch1/test:morphs -d ./branch1/test:morphs/.git +d ./branch1/test +d ./branch1/test/morphs +d ./branch1/test/morphs/.git d ./branch2 d ./branch2/.morph-system-branch -d ./branch2/test:morphs -d ./branch2/test:morphs/.git +d ./branch2/test +d ./branch2/test/morphs +d ./branch2/test/morphs/.git d ./branch3 d ./branch3/.morph-system-branch -d ./branch3/test:morphs -d ./branch3/test:morphs/.git +d ./branch3/test +d ./branch3/test/morphs +d ./branch3/test/morphs/.git d ./branch4 d ./branch4/.morph-system-branch -d ./branch4/test:morphs -d ./branch4/test:morphs/.git +d ./branch4/test +d ./branch4/test/morphs +d ./branch4/test/morphs/.git f ./branch1/.morph-system-branch/config -f ./branch1/test:morphs/hello-stratum.morph -f ./branch1/test: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/test:morphs/hello-stratum.morph -f ./branch2/test: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/test:morphs/hello-stratum.morph -f ./branch3/test: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/test:morphs/hello-stratum.morph -f ./branch4/test:morphs/hello-system.morph +f ./branch4/test/morphs/hello-stratum.morph +f ./branch4/test/morphs/hello-system.morph -- cgit v1.2.1