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/show-system-branch-works-in-different-directories-in-a-branch.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/show-system-branch-works-in-different-directories-in-a-branch.script')
| -rwxr-xr-x | tests.branching/show-system-branch-works-in-different-directories-in-a-branch.script | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.script b/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.script index f4abc8ea..c19e4093 100755 --- a/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.script +++ b/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.script @@ -24,8 +24,8 @@ set -eu # Create a workspace and two system branches. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs first/branch -"$SRCDIR/scripts/test-morph" branch baserock:morphs second/branch +"$SRCDIR/scripts/test-morph" branch test:morphs first/branch +"$SRCDIR/scripts/test-morph" branch test:morphs second/branch # Create a few subdirectories in the first branch. mkdir -p "$DATADIR/workspace/first/branch/foo" |