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/workflow.script | |
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/workflow.script')
-rwxr-xr-x | tests.branching/workflow.script | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests.branching/workflow.script b/tests.branching/workflow.script index 64326e4a..59c7b152 100755 --- a/tests.branching/workflow.script +++ b/tests.branching/workflow.script @@ -26,7 +26,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" branch me/readme-fix cd me/readme-fix/morphs "$SRCDIR/scripts/test-morph" edit baserock:hello master -cd ../hello +cd ../baserock:hello echo > README yoyoyo git add README git commit -m "Fix README, yo!" --quiet @@ -35,5 +35,5 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" checkout baserock:morphs master cd master/baserock:morphs "$SRCDIR/scripts/test-morph" edit baserock:hello master -"$SRCDIR/scripts/test-morph" merge me/readme-fix hello +"$SRCDIR/scripts/test-morph" merge me/readme-fix baserock:hello |