Fix test suite to cover lock --force change.

2 files changed, 8 insertions, 1 deletions

diff --git a/Test.hs b/Test.hs
index 4c7281fce..e40d935a9 100644
--- a/Test.hs
+++ b/Test.hs
@@ -423,7 +423,8 @@ test_lock env = intmpclonerepoInDirect env $ do
 	-- throws it away
 	changecontent annexedfile
 	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
 	git_annex env "unlock" [annexedfile] @? "unlock failed"		
 	unannexed annexedfile
diff --git a/debian/changelog b/debian/changelog
index da3117326..128a161f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
 
   * Avoid using git commit in direct mode, since in some situations