diff options
Diffstat (limited to 'tests.branching/workflow.script')
| -rwxr-xr-x | tests.branching/workflow.script | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests.branching/workflow.script b/tests.branching/workflow.script index cb79c3c5..68da4f4a 100755 --- a/tests.branching/workflow.script +++ b/tests.branching/workflow.script @@ -30,9 +30,10 @@ echo > README yoyoyo git add README git commit -m "Fix README, yo!" --quiet +cd ../baserock:morphs +git commit --quiet --all -m "Commit changes for system branch" + cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" checkout baserock:morphs master cd master -"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello -"$SRCDIR/scripts/test-morph" merge me/readme-fix baserock:hello - +"$SRCDIR/scripts/test-morph" merge me/readme-fix |