improve messages around export conflicts
When an export conflict prevents accessing a special remote, be clearer about what the problem is and how to resolve it. This commit was sponsored by Trenton Cronholm on Patreon.
This commit is contained in:
parent
6a0618f7b3
commit
d65df7ab21
6 changed files with 64 additions and 24 deletions
|
@ -720,9 +720,7 @@ seekExportContent rs (currbranch, _) = or <$> forM rs go
|
|||
fillexport r ea db (Exported { exportedTreeish = t }:[]) =
|
||||
Command.Export.fillExport r ea db t
|
||||
fillexport r _ _ _ = do
|
||||
warning $ "Export conflict detected. Different trees have been exported to " ++
|
||||
Remote.name r ++
|
||||
". Use git-annex export to resolve this conflict."
|
||||
warnExportConflict r
|
||||
return False
|
||||
|
||||
cleanupLocal :: CurrBranch -> CommandStart
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue