From 332b39f5df8a70f0c0146189a28d465da493e441 Mon Sep 17 00:00:00 2001
From: Jannis Pohlmann <jannis.pohlmann@codethink.co.uk>
Date: Thu, 30 Aug 2012 13:35:45 +0000
Subject: Fix branch/checkout to always create branches in the workspace
 directory

Doing this rather than creating the system branches in the current working
directory allows "morph branch" and "morph checkout" to be run anywhere in
the workspace (e.g. in a different branch).

This commit also adds two tests to verify that new branches are always
created in the toplevel workspace directory.
---
 tests.branching/branch-works-anywhere.stdout | 98 ++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 tests.branching/branch-works-anywhere.stdout

(limited to 'tests.branching/branch-works-anywhere.stdout')

diff --git a/tests.branching/branch-works-anywhere.stdout b/tests.branching/branch-works-anywhere.stdout
new file mode 100644
index 00000000..cddc2d76
--- /dev/null
+++ b/tests.branching/branch-works-anywhere.stdout
@@ -0,0 +1,98 @@
+Workspace after creating the first branch:
+d .
+d ./.morph
+d ./.morph/cache
+d ./.morph/cache/gits
+d ./.morph/cache/gits/file_morphs
+d ./.morph/cache/gits/file_morphs/.git
+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/baserock:morphs/hello-stratum.morph
+f ./branch1/baserock:morphs/hello-system.morph
+Workspace after creating the second branch:
+d .
+d ./.morph
+d ./.morph/cache
+d ./.morph/cache/gits
+d ./.morph/cache/gits/file_morphs
+d ./.morph/cache/gits/file_morphs/.git
+d ./branch1
+d ./branch1/.morph-system-branch
+d ./branch1/baserock:morphs
+d ./branch1/baserock:morphs/.git
+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/baserock:morphs/hello-stratum.morph
+f ./branch1/baserock:morphs/hello-system.morph
+f ./branch2/.morph-system-branch/branch-root
+f ./branch2/baserock:morphs/hello-stratum.morph
+f ./branch2/baserock:morphs/hello-system.morph
+Workspace after creating the third branch:
+d .
+d ./.morph
+d ./.morph/cache
+d ./.morph/cache/gits
+d ./.morph/cache/gits/file_morphs
+d ./.morph/cache/gits/file_morphs/.git
+d ./branch1
+d ./branch1/.morph-system-branch
+d ./branch1/baserock:morphs
+d ./branch1/baserock:morphs/.git
+d ./branch2
+d ./branch2/.morph-system-branch
+d ./branch2/baserock:morphs
+d ./branch2/baserock:morphs/.git
+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/baserock:morphs/hello-stratum.morph
+f ./branch1/baserock:morphs/hello-system.morph
+f ./branch2/.morph-system-branch/branch-root
+f ./branch2/baserock:morphs/hello-stratum.morph
+f ./branch2/baserock:morphs/hello-system.morph
+f ./branch3/.morph-system-branch/branch-root
+f ./branch3/baserock:morphs/hello-stratum.morph
+f ./branch3/baserock:morphs/hello-system.morph
+Workspace after creating the fourth branch:
+d .
+d ./.morph
+d ./.morph/cache
+d ./.morph/cache/gits
+d ./.morph/cache/gits/file_morphs
+d ./.morph/cache/gits/file_morphs/.git
+d ./branch1
+d ./branch1/.morph-system-branch
+d ./branch1/baserock:morphs
+d ./branch1/baserock:morphs/.git
+d ./branch2
+d ./branch2/.morph-system-branch
+d ./branch2/baserock:morphs
+d ./branch2/baserock:morphs/.git
+d ./branch3
+d ./branch3/.morph-system-branch
+d ./branch3/baserock:morphs
+d ./branch3/baserock:morphs/.git
+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/baserock:morphs/hello-stratum.morph
+f ./branch1/baserock:morphs/hello-system.morph
+f ./branch2/.morph-system-branch/branch-root
+f ./branch2/baserock:morphs/hello-stratum.morph
+f ./branch2/baserock:morphs/hello-system.morph
+f ./branch3/.morph-system-branch/branch-root
+f ./branch3/baserock:morphs/hello-stratum.morph
+f ./branch3/baserock:morphs/hello-system.morph
+f ./branch4/.morph-system-branch/branch-root
+f ./branch4/baserock:morphs/hello-stratum.morph
+f ./branch4/baserock:morphs/hello-system.morph
-- 
cgit v1.2.1