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

improve messages around export/import conflicts

Browse source 
A conflict can be caused by either export or import when the remote
supports both.
This commit is contained in:
Joey Hess 2019-04-09 13:03:59 -04:00
parent b51eceb326
commit 37041b629d
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Annex/Export.hs
View file

@ -42,8 +42,12 @@ exportKey sha = mk <$> catKey sha
, keyChunkNum = Nothing
}
warnExportConflict :: Remote -> Annex ()
warnExportConflict r = toplevelWarning True $
"Export conflict detected. Different trees have been exported to " ++
Remote.name r ++
". Use git-annex export to resolve this conflict."
warnExportImportConflict :: Remote -> Annex ()
warnExportImportConflict r = do
ops <- Remote.isImportSupported r >>= return . \case
True -> "exported to and/or imported from"
False -> "exported to"
toplevelWarning True $
"Conflict detected. Different trees have been " ++ ops ++
Remote.name r ++
". Use git-annex export to resolve this conflict."