mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix test suite to cover lock --force change.

Browse source
This commit is contained in:
Joey Hess 2013-12-15 13:33:09 -04:00
parent 87662ec14c
commit cee4c9a11d
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Test.hs
View file

@ -423,7 +423,8 @@ test_lock env = intmpclonerepoInDirect env $ do
-- throws it away -- throws it away
changecontent annexedfile changecontent annexedfile
writeFile annexedfile $ content annexedfile ++ "foo" writeFile annexedfile $ content annexedfile ++ "foo"
git_annex env "lock" [annexedfile] @? "lock failed" not <$> git_annex env "lock" [annexedfile] @? "lock failed to fail without --force"
git_annex env "lock" ["---force", annexedfile] @? "lock --force failed"
annexed_present annexedfile annexed_present annexedfile
git_annex env "unlock" [annexedfile] @? "unlock failed" git_annex env "unlock" [annexedfile] @? "unlock failed"
unannexed annexedfile unannexed annexedfile

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
git-annex (5.20131214) UNRELEASED; urgency=low
* Fix test suite to cover lock --force change.
-- Joey Hess <joeyh@debian.org> Sun, 15 Dec 2013 13:32:49 -0400
git-annex (5.20131213) unstable; urgency=low git-annex (5.20131213) unstable; urgency=low
* Avoid using git commit in direct mode, since in some situations * Avoid using git commit in direct mode, since in some situations