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-petrify.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-petrify.script')
| -rwxr-xr-x | tests.branching/workflow-petrify.script | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests.branching/workflow-petrify.script b/tests.branching/workflow-petrify.script index ac8b233e..a73e17db 100755 --- a/tests.branching/workflow-petrify.script +++ b/tests.branching/workflow-petrify.script @@ -31,44 +31,44 @@ fi . "$SRCDIR/scripts/setup-3rd-party-strata" cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" branch baserock:morphs test/petrify +"$SRCDIR/scripts/test-morph" branch test:morphs test/petrify cd test/petrify "$SRCDIR/scripts/test-morph" petrify echo "test/petrify after petrifying:" -cat baserock:morphs/hello-system.morph -cat baserock:external-strata/stratum2.morph -cat baserock:external-strata/stratum3.morph +cat test:morphs/hello-system.morph +cat test:external-strata/stratum2.morph +cat test:external-strata/stratum3.morph "$SRCDIR/scripts/test-morph" edit hello-system stratum2 hello echo echo "test/petrify after editing a chunk:" -cat baserock:morphs/hello-system.morph -cat baserock:external-strata/stratum2.morph -cat baserock:external-strata/stratum3.morph +cat test:morphs/hello-system.morph +cat test:external-strata/stratum2.morph +cat test:external-strata/stratum3.morph -# me/readme-fixes in baserock:stratum2-hello should be 'master', but +# me/readme-fixes in test:stratum2-hello should be 'master', but # that's the only ref upstream so we can infer that it is if we got here -cd baserock:morphs +cd test:morphs git commit --quiet --all -m "Petrify branch test/petrify" git push --quiet origin test/petrify -cd ../baserock:external-strata +cd ../test:external-strata git commit --quiet --all -m "Petrify branch test/petrify" git push --quiet origin test/petrify # unpetrify is easy enough. Let's try unpetrifying a different branch that # was forked off the original while it was petrified, instead. cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" branch baserock:morphs test/unpetrify test/petrify +"$SRCDIR/scripts/test-morph" branch test:morphs test/unpetrify test/petrify cd test/unpetrify "$SRCDIR/scripts/test-morph" unpetrify echo echo "test/unpetrify after unpetrifying:" -cat baserock:morphs/hello-system.morph -cat baserock:external-strata/stratum2.morph -cat baserock:external-strata/stratum3.morph +cat test:morphs/hello-system.morph +cat test:external-strata/stratum2.morph +cat test:external-strata/stratum3.morph |