diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-03-26 14:43:51 +0100 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-03-26 14:43:51 +0100 |
| commit | 0d202c2370201195d0ac5b930027a7fbcdc16cd5 (patch) | |
| tree | 2911f69296c01aa4b135711a2dc7a8542ec2191d /tests.branching/edit-checkouts-existing-chunk.script | |
| parent | f171b6b27ac8d3bb7235d409cb2510516cf66b8f (diff) | |
| download | morph-0d202c2370201195d0ac5b930027a7fbcdc16cd5.tar.gz | |
Change "checkout existing branch" test to not check out master
Checking out another branch exposed a bunch of bugs.
Diffstat (limited to 'tests.branching/edit-checkouts-existing-chunk.script')
| -rwxr-xr-x | tests.branching/edit-checkouts-existing-chunk.script | 14 |
1 files changed, 7 insertions, 7 deletions
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" |