From 0d202c2370201195d0ac5b930027a7fbcdc16cd5 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Mon, 26 Mar 2012 14:43:51 +0100 Subject: Change "checkout existing branch" test to not check out master Checking out another branch exposed a bunch of bugs. --- tests.branching/edit-checkouts-existing-chunk.script | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 144a3b07..583f19e1 100755 --- a/tests.branching/edit-checkouts-existing-chunk.script +++ b/tests.branching/edit-checkouts-existing-chunk.script @@ -23,17 +23,17 @@ set -eu # Checkout the master system branch. cd "$DATADIR/mine" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" checkout master +"$SRCDIR/scripts/test-morph" checkout alfred -# Edit the hello chunk in master. -cd master/morphs -"$SRCDIR/scripts/test-morph" edit hello master +# Edit the hello chunk in alfred. +cd alfred/morphs +"$SRCDIR/scripts/test-morph" edit hello alfred echo "Current branches, morphs:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/mine/master/morphs" branch +"$SRCDIR/scripts/run-git-in" "$DATADIR/mine/alfred/morphs" branch echo "Current branches, hello:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/mine/master/hello" branch +"$SRCDIR/scripts/run-git-in" "$DATADIR/mine/alfred/hello" branch echo "Files in hello:" -ls "$DATADIR/mine/master/hello" +ls "$DATADIR/mine/alfred/hello" -- cgit v1.2.1