perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/model: Mark deleted file as conflicting when un-ignoring (#4776)

Browse Source 
This completes #4750 as a followup to #4765.
This commit is contained in:
Simon Frei 2018-02-25 13:03:55 +01:00 committed by Jakob Borg
parent 42cc64e2ed
commit 36251b86f7
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/model/model.go
View File

@ -2066,6 +2066,14 @@ func (m *Model) internalScanFolderSubdirs(ctx context.Context, folder string, su
Deleted: true, Deleted: true,
Version: f.Version.Update(m.shortID), Version: f.Version.Update(m.shortID),
} }
// We do not want to override the global version
// with the deleted file. Keeping only our local
// counter makes sure we are in conflict with any
// other existing versions, which will be resolved
// by the normal pulling mechanisms.
if f.IsInvalid() {
nf.Version.DropOthers(m.shortID)
}
batch = append(batch, nf) batch = append(batch, nf)
batchSizeBytes += nf.ProtoSize() batchSizeBytes += nf.ProtoSize()