summaryrefslogtreecommitdiff
path: root/tests.branching
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-03-23 18:28:26 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-03-23 18:28:26 +0000
commit15ae23358b7492ee5ee68a7ef97fcfb905c0397d (patch)
treecf092256e2ded5bf7cbdc492b758ebee9d32b9f0 /tests.branching
parentf80a78b58da7f59fdb122ab78cdf82d0c50362e5 (diff)
downloadmorph-15ae23358b7492ee5ee68a7ef97fcfb905c0397d.tar.gz
Verify that "morph edit" checks out a working tree
Diffstat (limited to 'tests.branching')
-rwxr-xr-xtests.branching/edit-checkouts-existing-chunk.script2
-rw-r--r--tests.branching/edit-checkouts-existing-chunk.stdout2
2 files changed, 4 insertions, 0 deletions
diff --git a/tests.branching/edit-checkouts-existing-chunk.script b/tests.branching/edit-checkouts-existing-chunk.script
index cc5977ca..144a3b07 100755
--- a/tests.branching/edit-checkouts-existing-chunk.script
+++ b/tests.branching/edit-checkouts-existing-chunk.script
@@ -35,3 +35,5 @@ echo "Current branches, morphs:"
echo "Current branches, hello:"
"$SRCDIR/scripts/run-git-in" "$DATADIR/mine/master/hello" branch
+echo "Files in hello:"
+ls "$DATADIR/mine/master/hello"
diff --git a/tests.branching/edit-checkouts-existing-chunk.stdout b/tests.branching/edit-checkouts-existing-chunk.stdout
index c5be6aed..13122b91 100644
--- a/tests.branching/edit-checkouts-existing-chunk.stdout
+++ b/tests.branching/edit-checkouts-existing-chunk.stdout
@@ -2,3 +2,5 @@ Current branches, morphs:
* master
Current branches, hello:
* master
+Files in hello:
+hello.chunk