diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-05-03 13:48:08 +0100 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-05-04 14:24:07 +0100 |
commit | 34cec56598a84571f93573447a8e7ce941d0b293 (patch) | |
tree | 7f4b502f68852576620b5627a0d0bed1b002cdf1 /tests.branching | |
parent | 66327f8eb3cec93b53a3dcc948369ba48c9ad50a (diff) | |
download | morph-34cec56598a84571f93573447a8e7ce941d0b293.tar.gz |
Make morph's _clone_to_directory use CachedRepo.checkout
This requires changing CachedRepo.checkout to handle non-sha1 refs,
which resulted in some further changes in tests and their expected
outputs.
Also, a fix to CachedRepo to use the cwd keyword argument instead
of pwd.
Diffstat (limited to 'tests.branching')
-rw-r--r-- | tests.branching/checkout-existing-branch.stdout | 2 | ||||
-rw-r--r-- | tests.branching/edit-checkouts-existing-chunk.stdout | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests.branching/checkout-existing-branch.stdout b/tests.branching/checkout-existing-branch.stdout index 4b29db80..998b8acc 100644 --- a/tests.branching/checkout-existing-branch.stdout +++ b/tests.branching/checkout-existing-branch.stdout @@ -8,5 +8,7 @@ d ./.morph/cache/gits/file_morphs/.git d ./master d ./master/morphs d ./master/morphs/.git +f ./master/morphs/hello-stratum.chunk +f ./master/morphs/hello-system.chunk Current branches: * master diff --git a/tests.branching/edit-checkouts-existing-chunk.stdout b/tests.branching/edit-checkouts-existing-chunk.stdout index a06832c2..929db3e4 100644 --- a/tests.branching/edit-checkouts-existing-chunk.stdout +++ b/tests.branching/edit-checkouts-existing-chunk.stdout @@ -1,5 +1,6 @@ Current branches, morphs: -* master +* alfred + master Current branches, hello: * alfred master |