diff options
author | Joey Hess <joey@kitenet.net> | 2013-03-18 11:18:04 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-03-18 11:18:04 -0400 |
commit | 61b68e1ccec2de81207872b1227b9288670431c3 (patch) | |
tree | 68f989dc90e2ac104e7e00b99f46d24109049b09 /Annex/Content.hs | |
parent | bed98628db0f0776dc88354ef56ff70a92898a36 (diff) |
move comment to right place
Diffstat (limited to 'Annex/Content.hs')
-rw-r--r-- | Annex/Content.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs index 673e59b10..f8c39e1bc 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -276,10 +276,6 @@ replaceFile file a = do - In direct mode, it's possible for the file to change as it's being sent. - If this happens, runs the rollback action and returns False. The - rollback action should remove the data that was transferred. - - - - Note that the returned action is, in some cases, run in the Annex monad - - of the remote that is receiving the object, rather than the sender. - - So it cannot rely on Annex state, particular -} sendAnnex :: Key -> Annex () -> (FilePath -> Annex Bool) -> Annex Bool sendAnnex key rollback sendobject = go =<< prepSendAnnex key @@ -299,6 +295,10 @@ sendAnnex key rollback sendobject = go =<< prepSendAnnex key - - In direct mode, it's possible for the file to change as it's being sent, - and the check detects this case and returns False. + - + - Note that the returned check action is, in some cases, run in the + - Annex monad of the remote that is receiving the object, rather than + - the sender. So it cannot rely on Annex state, particular -} prepSendAnnex :: Key -> Annex (Maybe (FilePath, Annex Bool)) prepSendAnnex key = withObjectLoc key indirect direct |