import --clean-duplicates: Fix bug that didn't count local or trusted repo's copy of a file as one of the necessary copies to allow removing it from the import location.

Annex/NumCopies.hs

@@ -95,7 +95,7 @@ verifyEnoughCopies
 	:: String -- message to print when there are no known locations
 	-> Key
 	-> NumCopies
-	-> [UUID] -- repos to skip (generally untrusted remotes)
+	-> [UUID] -- repos to skip considering (generally untrusted remotes)
 	-> [UUID] -- repos that are trusted or already verified to have it
 	-> [Remote] -- remotes to check to see if they have it
 	-> Annex Bool

Command/Import.hs

@@ -144,4 +144,4 @@ verifiedExisting key destfile = do
 	(remotes, trusteduuids) <- knownCopies key
 	untrusteduuids <- trustGet UnTrusted
 	let tocheck = Remote.remotesWithoutUUID remotes (trusteduuids++untrusteduuids)
-	verifyEnoughCopies [] key need trusteduuids [] tocheck
+	verifyEnoughCopies [] key need [] trusteduuids tocheck

debian/changelog

@@ -9,6 +9,9 @@ git-annex (5.20150529) UNRELEASED; urgency=medium
     network-manager and wicd.
     Thanks to Sebastian Reuße for the patches.
   * get --incomplete: New option to resume any interrupted downloads.
+  * import --clean-duplicates: Fix bug that didn't count local or trusted
+    repo's copy of a file as one of the necessary copies to allow removing
+    it from the import location.
 
  -- Joey Hess <id@joeyh.name>  Sat, 30 May 2015 02:07:18 -0400
 

doc/bugs/clean-duplicates_doesn__39__t_delete_duplicates.mdwn

@@ -108,3 +108,6 @@ OS: Arch Linux
 
 # End of transcript or log.
 """]]
+
+> Indeed, I seem to have broken it while refactoring. [[fixed|done]]
+> --[[Joey]]