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

2
Command/Sync.hs
View file

@ -755,7 +755,7 @@ seekExportContent o rs (currbranch, _) = or <$> forM rs go
fillexport _ _ [] _ = return False
fillexport r db (t:[]) mtbcommitsha = Command.Export.fillExport r db t mtbcommitsha
fillexport r _ _ _ = do
warnExportConflict r
warnExportImportConflict r
return False
cleanupLocal :: CurrBranch -> CommandStart