From 586aacfe5b6c5f9b0d18ffa3fd9fe00f6692fe83 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 5 Sep 2012 19:46:44 +0100 Subject: 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. --- tests.branching/workflow.script | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tests.branching/workflow.script') 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 -- cgit v1.2.1