diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-15 19:18:04 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-15 19:18:04 -0400 |
| commit | 9faa6f0e33dd9e8c7ec3b96715ea3878ff9ef2f0 (patch) | |
| tree | 3bde05906addb27cb565d67b05bf686945ee235a /Annex/Direct.hs | |
| parent | 8986a918e5af331db29b953e061dc2d20a5b86d2 (diff) | |
| parent | a243fb1c7f04817fa19209689849aa2fe8631b3d (diff) | |
Merge branch 'master' into windows
Diffstat (limited to 'Annex/Direct.hs')
| -rw-r--r-- | Annex/Direct.hs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Annex/Direct.hs b/Annex/Direct.hs index 596c90994..67822f2d5 100644 --- a/Annex/Direct.hs +++ b/Annex/Direct.hs @@ -191,6 +191,7 @@ toDirectGen k f = do {- Move content from annex to direct file. -} thawContentDir loc updateInodeCache k loc + addAssociatedFile k f thawContent loc replaceFile f $ liftIO . moveFile loc fromdirect = do |