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/status-in-dirty-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/status-in-dirty-branch.script')
| -rwxr-xr-x | tests.branching/status-in-dirty-branch.script | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests.branching/status-in-dirty-branch.script b/tests.branching/status-in-dirty-branch.script index beb58ced..18aaf61e 100755 --- a/tests.branching/status-in-dirty-branch.script +++ b/tests.branching/status-in-dirty-branch.script @@ -22,13 +22,13 @@ set -eu . "$SRCDIR/scripts/setup-3rd-party-strata" cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" branch baserock:morphs test +"$SRCDIR/scripts/test-morph" branch test:morphs branch1 # Make the branch have some interesting changes and pitfalls -cd test +cd branch1 "$SRCDIR/scripts/test-morph" edit hello-system stratum2 hello -cd baserock:stratum2-hello +cd test:stratum2-hello git checkout -q master cd .. |