lib/model: Fix regressions detecting deletes/ignores (fixes #5125, fixes #5127) (#5129)

2018-08-25 10:32:35 +02:00
parent 7dde6c7e3c
commit 03c0537340
5 changed files with 214 additions and 78 deletions
--- a/lib/db/set.go
+++ b/lib/db/set.go
@@ -45,6 +45,7 @@ type FileIntf interface {
 	MustRescan() bool
 	IsDirectory() bool
 	IsSymlink() bool
+	ShouldConflict() bool
 	HasPermissionBits() bool
 	SequenceNo() int64
 	BlockSize() int