diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-05 19:46:44 +0100 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-09-10 10:59:39 +0000 |
| commit | 586aacfe5b6c5f9b0d18ffa3fd9fe00f6692fe83 (patch) | |
| tree | 45a1d26bbc4f330ec0d25ba1de198d1a4600d88d /tests.branching/workflow.script | |
| parent | fb2e08f81d96741c05597208fdab196ec0c1b584 (diff) | |
| download | morph-586aacfe5b6c5f9b0d18ffa3fd9fe00f6692fe83.tar.gz | |
Rewrite 'merge' command
'merge' now traverses every system in the branch root (baserock:morphs)
and merges any chunk or stratum that was changed with 'morph edit'. It
also takes care of updating the refs in the target branch.
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 |