diff options
author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-08-31 14:59:35 +0000 |
---|---|---|
committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-08-31 15:06:56 +0000 |
commit | 6935a3db514f1552c2ffd4d24b6521bb185dcd73 (patch) | |
tree | 61131d3f43a1856e7b84b61a7520265d30539747 /tests.branching/branch-works-anywhere.stdout | |
parent | dfd41a201e9d7efd3e98653e94c11434302fe7a4 (diff) | |
download | morph-6935a3db514f1552c2ffd4d24b6521bb185dcd73.tar.gz |
Use git config to store the branch root in .morph-system-branch/config
This way we can store more branch config options in the future more
conveniently without having store them all in separate files or writing
our own code to parse the options into a branch config object or
something like that.
Diffstat (limited to 'tests.branching/branch-works-anywhere.stdout')
-rw-r--r-- | tests.branching/branch-works-anywhere.stdout | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests.branching/branch-works-anywhere.stdout b/tests.branching/branch-works-anywhere.stdout index cddc2d76..ec22698f 100644 --- a/tests.branching/branch-works-anywhere.stdout +++ b/tests.branching/branch-works-anywhere.stdout @@ -9,7 +9,7 @@ d ./branch1 d ./branch1/.morph-system-branch d ./branch1/baserock:morphs d ./branch1/baserock:morphs/.git -f ./branch1/.morph-system-branch/branch-root +f ./branch1/.morph-system-branch/config f ./branch1/baserock:morphs/hello-stratum.morph f ./branch1/baserock:morphs/hello-system.morph Workspace after creating the second branch: @@ -27,10 +27,10 @@ d ./branch2 d ./branch2/.morph-system-branch d ./branch2/baserock:morphs d ./branch2/baserock:morphs/.git -f ./branch1/.morph-system-branch/branch-root +f ./branch1/.morph-system-branch/config f ./branch1/baserock:morphs/hello-stratum.morph f ./branch1/baserock:morphs/hello-system.morph -f ./branch2/.morph-system-branch/branch-root +f ./branch2/.morph-system-branch/config f ./branch2/baserock:morphs/hello-stratum.morph f ./branch2/baserock:morphs/hello-system.morph Workspace after creating the third branch: @@ -52,13 +52,13 @@ d ./branch3 d ./branch3/.morph-system-branch d ./branch3/baserock:morphs d ./branch3/baserock:morphs/.git -f ./branch1/.morph-system-branch/branch-root +f ./branch1/.morph-system-branch/config f ./branch1/baserock:morphs/hello-stratum.morph f ./branch1/baserock:morphs/hello-system.morph -f ./branch2/.morph-system-branch/branch-root +f ./branch2/.morph-system-branch/config f ./branch2/baserock:morphs/hello-stratum.morph f ./branch2/baserock:morphs/hello-system.morph -f ./branch3/.morph-system-branch/branch-root +f ./branch3/.morph-system-branch/config f ./branch3/baserock:morphs/hello-stratum.morph f ./branch3/baserock:morphs/hello-system.morph Workspace after creating the fourth branch: @@ -84,15 +84,15 @@ d ./branch4 d ./branch4/.morph-system-branch d ./branch4/baserock:morphs d ./branch4/baserock:morphs/.git -f ./branch1/.morph-system-branch/branch-root +f ./branch1/.morph-system-branch/config f ./branch1/baserock:morphs/hello-stratum.morph f ./branch1/baserock:morphs/hello-system.morph -f ./branch2/.morph-system-branch/branch-root +f ./branch2/.morph-system-branch/config f ./branch2/baserock:morphs/hello-stratum.morph f ./branch2/baserock:morphs/hello-system.morph -f ./branch3/.morph-system-branch/branch-root +f ./branch3/.morph-system-branch/config f ./branch3/baserock:morphs/hello-stratum.morph f ./branch3/baserock:morphs/hello-system.morph -f ./branch4/.morph-system-branch/branch-root +f ./branch4/.morph-system-branch/config f ./branch4/baserock:morphs/hello-stratum.morph f ./branch4/baserock:morphs/hello-system.morph |