mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

test suite noticed a direct mode reversion

Browse source
This commit is contained in:
Joey Hess 2015-12-29 17:11:28 -04:00
parent 10ecc43790
commit f3be28eedc
Failed to extract signature
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Annex/AutoMerge.hs
View file

@ -129,7 +129,10 @@ resolveMerge' unstagedmap (Just us) them u = do
| keyUs /= keyThem -> resolveby [keyUs, keyThem] $ do | keyUs /= keyThem -> resolveby [keyUs, keyThem] $ do
makeannexlink keyUs LsFiles.valUs makeannexlink keyUs LsFiles.valUs
makeannexlink keyThem LsFiles.valThem 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 | otherwise -> do
-- Only resolve using symlink when both -- Only resolve using symlink when both
-- were locked, otherwise use unlocked -- were locked, otherwise use unlocked