diff options
Diffstat (limited to 'Annex/Direct.hs')
| -rw-r--r-- | Annex/Direct.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Annex/Direct.hs b/Annex/Direct.hs index 648bb7518..b33fef8bc 100644 --- a/Annex/Direct.hs +++ b/Annex/Direct.hs @@ -143,7 +143,7 @@ mergeDirectCleanup d oldsha newsha = do - Empty work tree directories are removed, per git behavior. -} moveout_raw f = liftIO $ do nukeFile f - void $ catchMaybeIO $ removeDirectory $ parentDir f + void $ tryIO $ removeDirectory $ parentDir f {- The symlink is created from the key, rather than moving in the - symlink created in the temp directory by the merge. This because @@ -161,7 +161,7 @@ mergeDirectCleanup d oldsha newsha = do - directory by the merge, and are moved to the real work tree. -} movein_raw f = liftIO $ do createDirectoryIfMissing True $ parentDir f - void $ catchMaybeIO $ rename (d </> f) f + void $ tryIO $ rename (d </> f) f {- If possible, converts a symlink in the working tree into a direct - mode file. -} @@ -203,7 +203,7 @@ removeDirect k f = do _ -> noop liftIO $ do nukeFile f - void $ catchMaybeIO $ removeDirectory $ parentDir f + void $ tryIO $ removeDirectory $ parentDir f {- Called when a direct mode file has been changed. Its old content may be - lost. -} |