diff options
| author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-08-29 14:46:35 +0000 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-08-29 18:49:31 +0100 |
| commit | b657fbcab062073ff4dd1c69a72b252e4992e152 (patch) | |
| tree | 6739bceee440567f10aaead17974b5eeaa7e8fb6 /tests.branching/branch-creates-new-system-branch-not-from-master.stdout | |
| parent | ce83a0afe0a51c9b8ab75e89d23f45c3ebf2be93 (diff) | |
| download | morph-b657fbcab062073ff4dd1c69a72b252e4992e152.tar.gz | |
Add mandatory repository parameter to "morph branch"
This is complementary to adding a repository parameter to the "morph
checkout" command. It allows to branch off arbitrary repositories
rather than always branching off baserock:morphs.
All affected tests are updated to provide and work with this new
parameter.
Diffstat (limited to 'tests.branching/branch-creates-new-system-branch-not-from-master.stdout')
| -rw-r--r-- | tests.branching/branch-creates-new-system-branch-not-from-master.stdout | 10 |
1 files changed, 5 insertions, 5 deletions
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 7dc55cc0..d68a6342 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 @@ -7,12 +7,12 @@ 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 +d ./newbranch/baserock:morphs +d ./newbranch/baserock:morphs/.git f ./newbranch/.morph-system-branch/branch-root -f ./newbranch/morphs/hello-stratum.morph -f ./newbranch/morphs/hello-system.morph -f ./newbranch/morphs/this.is.alfred +f ./newbranch/baserock:morphs/hello-stratum.morph +f ./newbranch/baserock:morphs/hello-system.morph +f ./newbranch/baserock:morphs/this.is.alfred Current branches: master * newbranch |