diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-11-12 13:57:59 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-11-12 13:57:59 +0000 |
| commit | 19b16a2cc6d67871d0a4298354eb446ada136a8e (patch) | |
| tree | 01361b4995f97e26dfa6db56c685bc51a7f8b122 /tests.branching/branch-works-anywhere.script | |
| parent | 6eca890690217136a9685ca9ac55f6ea59882e9c (diff) | |
| parent | eeb6c8bde8112dd760853a0f35d6d0d7d9676fa7 (diff) | |
| download | morph-19b16a2cc6d67871d0a4298354eb446ada136a8e.tar.gz | |
Merge branch 'samthursfield/test-tidying' of git://git.baserock.org/baserock/morph
Diffstat (limited to 'tests.branching/branch-works-anywhere.script')
| -rwxr-xr-x | tests.branching/branch-works-anywhere.script | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests.branching/branch-works-anywhere.script b/tests.branching/branch-works-anywhere.script index 19a00024..5198d7f4 100755 --- a/tests.branching/branch-works-anywhere.script +++ b/tests.branching/branch-works-anywhere.script @@ -22,7 +22,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init # First, create a branch. -"$SRCDIR/scripts/test-morph" branch baserock:morphs branch1 +"$SRCDIR/scripts/test-morph" branch test:morphs branch1 echo "Workspace after creating the first branch:" "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' | @@ -30,7 +30,7 @@ echo "Workspace after creating the first branch:" grep -v 'cache/gits/file_[^/]*/' # Now, create a nother branch from the workspace. -"$SRCDIR/scripts/test-morph" branch baserock:morphs branch2 +"$SRCDIR/scripts/test-morph" branch test:morphs branch2 echo "Workspace after creating the second branch:" "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' | @@ -41,7 +41,7 @@ echo "Workspace after creating the second branch:" # should not be created in the working directory but in the # workspace directory. cd "$DATADIR/workspace/branch1" -"$SRCDIR/scripts/test-morph" branch baserock:morphs branch3 +"$SRCDIR/scripts/test-morph" branch test:morphs branch3 echo "Workspace after creating the third branch:" "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' | @@ -51,8 +51,8 @@ echo "Workspace after creating the third branch:" # Now, go into the morphs repository of that third branch and # create a fourth system branch from in there. This, too, should # end up being created in the toplevel workspace directory. -cd "$DATADIR/workspace/branch3/baserock:morphs" -"$SRCDIR/scripts/test-morph" branch baserock:morphs branch4 +cd "$DATADIR/workspace/branch3/test:morphs" +"$SRCDIR/scripts/test-morph" branch test:morphs branch4 echo "Workspace after creating the fourth branch:" "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' | |