diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-12-29 17:35:57 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-29 17:35:57 -0400 |
| commit | 0c0a9ac234cd9509f5dda11cecbc8771fc0e14f2 (patch) | |
| tree | 947cb7cc006f3a584c1c45b89fc13083c89792eb /Annex | |
| parent | ca1b705c21071f6386b4da3c15ca0880c33da156 (diff) | |
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.
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/AutoMerge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs index b673a5e6f..a332596f6 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 |