diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-12-29 17:11:28 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-29 17:12:57 -0400 |
| commit | ca1b705c21071f6386b4da3c15ca0880c33da156 (patch) | |
| tree | bd397b533bdfba0ec550a2a3ba4db62b69fdba17 /Annex/AutoMerge.hs | |
| parent | 2d67628a5acbb9e77f9975e8139c52455704981f (diff) | |
test suite noticed a direct mode reversion
Diffstat (limited to 'Annex/AutoMerge.hs')
| -rw-r--r-- | Annex/AutoMerge.hs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs index 35156eaff..b673a5e6f 100644 --- a/Annex/AutoMerge.hs +++ b/Annex/AutoMerge.hs @@ -129,7 +129,10 @@ resolveMerge' unstagedmap (Just us) them u = do | keyUs /= keyThem -> resolveby [keyUs, keyThem] $ do makeannexlink keyUs LsFiles.valUs makeannexlink keyThem LsFiles.valThem - liftIO $ nukeFile file + -- cleanConflictCruft can't handle unlocked + -- files, so delete here. + unless (islocked LsFiles.valUs) $ + liftIO $ nukeFile file | otherwise -> do -- Only resolve using symlink when both -- were locked, otherwise use unlocked |