From b78ac0f72aa2fc4815131bb2bbd883a373c62e48 Mon Sep 17 00:00:00 2001 From: Jannis Pohlmann Date: Tue, 28 Aug 2012 16:43:51 +0000 Subject: 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. --- tests.branching/branch-creates-new-system-branch-not-from-master.stdout | 1 + 1 file changed, 1 insertion(+) (limited to 'tests.branching/branch-creates-new-system-branch-not-from-master.stdout') diff --git a/tests.branching/branch-creates-new-system-branch-not-from-master.stdout b/tests.branching/branch-creates-new-system-branch-not-from-master.stdout index 7dfffab1..af1ad6cd 100644 --- a/tests.branching/branch-creates-new-system-branch-not-from-master.stdout +++ b/tests.branching/branch-creates-new-system-branch-not-from-master.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 -- cgit v1.2.1