From d08d0afa388c8767a2e6eb13b8ba0c53e531e23f Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Mon, 17 Sep 2012 15:18:24 +0100 Subject: Update branching tests to use 'morph foreach' --- tests.branching/edit-checkouts-existing-chunk.script | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'tests.branching/edit-checkouts-existing-chunk.script') diff --git a/tests.branching/edit-checkouts-existing-chunk.script b/tests.branching/edit-checkouts-existing-chunk.script index bc1650b7..5e0d7bc9 100755 --- a/tests.branching/edit-checkouts-existing-chunk.script +++ b/tests.branching/edit-checkouts-existing-chunk.script @@ -26,13 +26,12 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" checkout baserock:morphs alfred # Edit the hello chunk in alfred. +cd "alfred" "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello -echo "Current branches, morphs:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/alfred/baserock:morphs" branch - -echo "Current branches, hello:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/alfred/baserock:hello" branch +echo "Current branches:" +"$SRCDIR/scripts/test-morph" foreach git branch +echo echo "Files in hello:" ls "$DATADIR/workspace/alfred/baserock:hello" -- cgit v1.2.1