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/checkout-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/checkout-works-anywhere.script')
-rwxr-xr-x | tests.branching/checkout-works-anywhere.script | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests.branching/checkout-works-anywhere.script b/tests.branching/checkout-works-anywhere.script index 73e30498..c7d046e4 100755 --- a/tests.branching/checkout-works-anywhere.script +++ b/tests.branching/checkout-works-anywhere.script @@ -22,7 +22,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init # First, check out the master branch from the workspace directory. -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master +"$SRCDIR/scripts/test-morph" checkout test:morphs master echo "Workspace after checking out master from the workspace directory:" "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' | @@ -38,9 +38,9 @@ cd workspace # This time, create a new branch and check out the master branch # from within that branch. -"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch -cd newbranch/baserock:morphs -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master +"$SRCDIR/scripts/test-morph" branch test:morphs newbranch +cd newbranch/test:morphs +"$SRCDIR/scripts/test-morph" checkout test:morphs master echo "Workspace after checking out master from within a new branch:" "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' | |