Garmelon/PFERD
1
0
Fork 0
mirror of https://github.com/Garmelon/PFERD.git synced 2026-04-12 07:25:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Treat file overwrite and marked file overwrite differently

Browse source
This commit is contained in:
I-Al-Istannen 2020-12-05 14:03:43 +01:00
parent 2d64409542
commit 4ce385b262
2 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sync_url.py
View file

@ -30,6 +30,8 @@ def _resolve_no_delete(_path: PurePath, conflict: ConflictType) -> FileConflictR
# Update files
if conflict == ConflictType.FILE_OVERWRITTEN:
return FileConflictResolution.DESTROY_EXISTING
if conflict == ConflictType.MARKED_FILE_OVERWRITTEN:
return FileConflictResolution.DESTROY_EXISTING
# But do not delete them
return FileConflictResolution.KEEP_EXISTING