diff options
| author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-08-29 15:59:02 +0000 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-08-29 18:49:31 +0100 |
| commit | ce83a0afe0a51c9b8ab75e89d23f45c3ebf2be93 (patch) | |
| tree | 1cb88b939109007383f4dec3da61e1b66c6d76cc /tests.branching/branch-creates-new-system-branch.stdout | |
| parent | 34c03048cc99e8a8abeb3e3c99574a92a2acb00a (diff) | |
| download | morph-ce83a0afe0a51c9b8ab75e89d23f45c3ebf2be93.tar.gz | |
Remember repository that was branched off from for merging and editing
With this commit, "morph branch" and "morph checkout" remember the
repository that was branched off from (the "branch root") in a special
file called
$workspace/$branch/.morph-system-branch/branch-root
This information is later used when checking out individual
repositories using "morph edit" instead of using the previously
hard-coded "$workspace/$branch/morphs" repository as the branch
root.
This commit also updates the "morph merge" code to handle repositories
specified with aliases or as full URLs in the same way "morph checkout"
does.
All affected tests are updated.
Diffstat (limited to 'tests.branching/branch-creates-new-system-branch.stdout')
| -rw-r--r-- | tests.branching/branch-creates-new-system-branch.stdout | 1 |
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 e22ef30b..c37fb0e4 100644 --- a/tests.branching/branch-creates-new-system-branch.stdout +++ b/tests.branching/branch-creates-new-system-branch.stdout @@ -9,6 +9,7 @@ d ./newbranch d ./newbranch/.morph-system-branch d ./newbranch/morphs d ./newbranch/morphs/.git +f ./newbranch/.morph-system-branch/branch-root f ./newbranch/morphs/hello-stratum.morph f ./newbranch/morphs/hello-system.morph Current branches: |