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

update design doc with final design choices

Browse source
This commit is contained in:
Joey Hess 2019-04-09 13:05:22 -04:00
parent 37041b629d
commit 2dc20e3fa4
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Remote/Helper/ExportImport.hs
View file

@ -308,7 +308,7 @@ adjustExportImport r = case M.lookup "exporttree" (config r) of
Just () -> Export.updateExportTreeFromLog db >>= \case
Export.ExportUpdateSuccess -> return ()
Export.ExportUpdateConflict -> do
warnExportConflict r
warnExportImportConflict r
liftIO $ atomically $
writeTVar exportinconflict True
Nothing -> return ()