From 6c3a6cc1885b0e64541adb968bc43f1e79c66167 Mon Sep 17 00:00:00 2001 From: Jean Jordaan Date: Fri, 3 Apr 2015 14:21:50 +0700 Subject: [PATCH 1/2] Steer towards deduplication --- Command/Import.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Command/Import.hs b/Command/Import.hs index b20e638533..1017129868 100644 --- a/Command/Import.hs +++ b/Command/Import.hs @@ -98,7 +98,7 @@ start mode (srcfile, destfile) = | isDirectory s = notoverwriting "(is a directory)" | otherwise = ifM (Annex.getState Annex.force) ( liftIO $ nukeFile destfile - , notoverwriting "(use --force to override)" + , notoverwriting "(use --force to override, or a duplication option such as --deduplicate to clean up)" ) notoverwriting why = error $ "not overwriting existing " ++ destfile ++ " " ++ why pickaction isdup = case mode of From 500cf3e37e3679a564df499ba3d8cfc893911dcb Mon Sep 17 00:00:00 2001 From: Jean Jordaan Date: Fri, 3 Apr 2015 14:21:50 +0700 Subject: [PATCH 2/2] Steer towards deduplication --- Command/Import.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Command/Import.hs b/Command/Import.hs index 2da26a96bb..17cb49db16 100644 --- a/Command/Import.hs +++ b/Command/Import.hs @@ -89,7 +89,7 @@ start mode (srcfile, destfile) = | isDirectory s = notoverwriting "(is a directory)" | otherwise = ifM (Annex.getState Annex.force) ( liftIO $ nukeFile destfile - , notoverwriting "(use --force to override)" + , notoverwriting "(use --force to override, or a duplication option such as --deduplicate to clean up)" ) notoverwriting why = error $ "not overwriting existing " ++ destfile ++ " " ++ why checkdup dupa notdupa = do