octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-08 14:58:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Don't try to delete deleted item on revert (#7843)

Browse Source
This commit is contained in:
Simon Frei 2021-07-23 14:26:20 +02:00 committed by GitHub
parent 7ec76095e6
commit dc0dd09e93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/model/folder_recvonly.go
View File

@ -112,7 +112,10 @@ func (f *receiveOnlyFolder) revert() error {
// The global file is our own. A revert then means to delete it. // The global file is our own. A revert then means to delete it.
// We'll delete files directly, directories get queued and // We'll delete files directly, directories get queued and
// handled below. // handled below.
if fi.Deleted {
fi.Version = protocol.Vector{} // if this file ever resurfaces anywhere we want our delete to be strictly older
break
}
handled, err := delQueue.handle(fi, snap) handled, err := delQueue.handle(fi, snap)
if err != nil { if err != nil {
l.Infof("Revert: deleting %s: %v\n", fi.Name, err) l.Infof("Revert: deleting %s: %v\n", fi.Name, err)