From 5057fffccd3900d2156e4379f4fae30be5cf8b32 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Dec 2015 17:35:57 -0400 Subject: [PATCH] flush queue before cleaning cruft Else, queued file stages won't have reached the index, and it won't find everthing. This evidently fixes a reversion in my work today, although I don't see how I broke it. It didn't use to flush the queue first, before, and worked somehow. Test suite for v5 is back to 100% green now. --- Annex/AutoMerge.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs index b673a5e6fe..a332596f68 100644 --- a/Annex/AutoMerge.hs +++ b/Annex/AutoMerge.hs @@ -111,10 +111,10 @@ resolveMerge us them = do void $ liftIO cleanup2 when merged $ do + Annex.Queue.flush unlessM isDirect $ do unstagedmap <- inodeMap $ inRepo $ LsFiles.notInRepo False [top] cleanConflictCruft mergedks' mergedfs' unstagedmap - Annex.Queue.flush showLongNote "Merge conflict was automatically resolved; you may want to examine the result." return merged