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/workflow.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/workflow.script')
| -rwxr-xr-x | tests.branching/workflow.script | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests.branching/workflow.script b/tests.branching/workflow.script index 68da4f4a..56415ce4 100755 --- a/tests.branching/workflow.script +++ b/tests.branching/workflow.script @@ -23,17 +23,17 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs me/readme-fix +"$SRCDIR/scripts/test-morph" branch test:morphs me/readme-fix "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello -cd me/readme-fix/baserock:hello +cd me/readme-fix/test:hello echo > README yoyoyo git add README git commit -m "Fix README, yo!" --quiet -cd ../baserock:morphs +cd ../test:morphs git commit --quiet --all -m "Commit changes for system branch" cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master +"$SRCDIR/scripts/test-morph" checkout test:morphs master cd master "$SRCDIR/scripts/test-morph" merge me/readme-fix |