diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-19 12:46:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-19 12:46:35 -0400 |
| commit | 3c0c77388bb4e6d66901b95a1cf77da0071b4e02 (patch) | |
| tree | 25611f16424272b96fb4d15bf67fc6cb761d3ade /Annex/Direct.hs | |
| parent | 67cc72d540d8dd03f433a135297ba86d896ba14d (diff) | |
comment
Diffstat (limited to 'Annex/Direct.hs')
| -rw-r--r-- | Annex/Direct.hs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Annex/Direct.hs b/Annex/Direct.hs index 6ddea08fb..77a544257 100644 --- a/Annex/Direct.hs +++ b/Annex/Direct.hs @@ -153,7 +153,12 @@ mergeDirectCleanup d oldsha newsha = do nukeFile f void $ catchMaybeIO $ removeDirectory $ parentDir f - {- Key symlinks are replaced with their content, if it's available. -} + {- The symlink is created from the key, rather than moving in the + - symlink created in the temp directory by the merge. This because + - a conflicted merge will write to some other file in the temp + - directory. + - + - Symlinks are replaced with their content, if it's available. -} movein k f = do l <- calcGitLink f k liftIO $ replaceFile f $ const $ |