From f3be28eedc89bde02bc69b2bb073266bb5000161 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Dec 2015 17:11:28 -0400 Subject: [PATCH] test suite noticed a direct mode reversion --- Annex/AutoMerge.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs index 35156eafff..b673a5e6fe 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