summaryrefslogtreecommitdiff
path: root/tests.branching/branch-creates-new-system-branch.stdout
diff options
context:
space:
mode:
authorJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-08-28 16:43:51 +0000
committerJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-08-29 18:44:52 +0100
commitb78ac0f72aa2fc4815131bb2bbd883a373c62e48 (patch)
tree457b02ccb81f3d15df8e66edeefa1f93d948aed9 /tests.branching/branch-creates-new-system-branch.stdout
parent384689e00d8bed6b1e5373dda6fc407ae9d197b6 (diff)
downloadmorph-b78ac0f72aa2fc4815131bb2bbd883a373c62e48.tar.gz
Use .morph-system-branch directories to identify branch directories
The commands "morph branch" and "morph checkout" now create a .morph-system-branch directory for each system branch. This is the per-branch analogue to the .morph directory for a workspace. The .morph-system-branch directories make it possible to store state and other information for system branches. They also make deducing the current system branch more robust and clear.
Diffstat (limited to 'tests.branching/branch-creates-new-system-branch.stdout')
-rw-r--r--tests.branching/branch-creates-new-system-branch.stdout1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests.branching/branch-creates-new-system-branch.stdout b/tests.branching/branch-creates-new-system-branch.stdout
index d2884b8c..e22ef30b 100644
--- a/tests.branching/branch-creates-new-system-branch.stdout
+++ b/tests.branching/branch-creates-new-system-branch.stdout
@@ -6,6 +6,7 @@ d ./.morph/cache/gits
d ./.morph/cache/gits/file_morphs
d ./.morph/cache/gits/file_morphs/.git
d ./newbranch
+d ./newbranch/.morph-system-branch
d ./newbranch/morphs
d ./newbranch/morphs/.git
f ./newbranch/morphs/hello-stratum.morph