summaryrefslogtreecommitdiff
path: root/tests.branching/checkout-existing-branch.stdout
diff options
context:
space:
mode:
authorJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-08-29 13:06:27 +0000
committerJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-08-29 18:49:26 +0100
commit34c03048cc99e8a8abeb3e3c99574a92a2acb00a (patch)
treeaa6068e4d03fbca208f81d2f73056b3608fab401 /tests.branching/checkout-existing-branch.stdout
parent4018afbdb583517277a0f1f7d990fa4c2a04923a (diff)
downloadmorph-34c03048cc99e8a8abeb3e3c99574a92a2acb00a.tar.gz
Make "morph checkout" require a repository parameter
Instead of hard-coding "baserock:morphs" as the repository we check out from, we want to allow people to check out from arbitrary repositories with system and stratum morphologies. This commit adds a mandatory repository parameter to "morph checkout". This parameter can either be an aliased repo, e.g. baserock:morphs, or a full repo URL such as ssh://gitano@git.baserock.org/baserock/morphs. When cloning the actual repository into a local directory, the following happens: For alias repos baserock:morphs and baserock:foo/bar, the repositories would be cloned into the directories $workspace/$branch/baserock:morphs and $workspace/$branch/baserock:foo/bar. For repos specified using full URLs, the scheme and .git suffix (if present) are stripped off. The above ssh example would be cloned into the following directory: $workspace/$branch/gitano@git.baserock.org/baserock/morphs This commit also adjusts all affected tests and adds a new test to verify that checking out from full repo URLs works as expected.
Diffstat (limited to 'tests.branching/checkout-existing-branch.stdout')
-rw-r--r--tests.branching/checkout-existing-branch.stdout8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests.branching/checkout-existing-branch.stdout b/tests.branching/checkout-existing-branch.stdout
index 47043bbe..7ac4a149 100644
--- a/tests.branching/checkout-existing-branch.stdout
+++ b/tests.branching/checkout-existing-branch.stdout
@@ -7,9 +7,9 @@ d ./.morph/cache/gits/file_morphs
d ./.morph/cache/gits/file_morphs/.git
d ./master
d ./master/.morph-system-branch
-d ./master/morphs
-d ./master/morphs/.git
-f ./master/morphs/hello-stratum.morph
-f ./master/morphs/hello-system.morph
+d ./master/baserock:morphs
+d ./master/baserock:morphs/.git
+f ./master/baserock:morphs/hello-stratum.morph
+f ./master/baserock:morphs/hello-system.morph
Current branches:
* master