From dc0dd09e935b76957ba91b674e93e3749e7b667a Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Fri, 23 Jul 2021 14:26:20 +0200 Subject: [PATCH] lib/model: Don't try to delete deleted item on revert (#7843) --- lib/model/folder_recvonly.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/model/folder_recvonly.go b/lib/model/folder_recvonly.go index 6351409bf..1f57ebf88 100644 --- a/lib/model/folder_recvonly.go +++ b/lib/model/folder_recvonly.go @@ -112,7 +112,10 @@ func (f *receiveOnlyFolder) revert() error { // The global file is our own. A revert then means to delete it. // We'll delete files directly, directories get queued and // 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) if err != nil { l.Infof("Revert: deleting %s: %v\n", fi.Name, err)