Skip to content

Commit

Permalink
🎨 Automatic synchronization mode prevents old cloud data from overwri…
Browse files Browse the repository at this point in the history
…ting new local data siyuan-note/siyuan#9601
  • Loading branch information
88250 committed Nov 8, 2023
1 parent 1adebb1 commit 1c969bc
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ func (repo *Repo) DiffUpsertRemove(left, right []*entity.File, preventOldUpserts
if preventOldUpsertsLeftOverwriteRight && l[lPath].Updated < rFile.Updated {
// 在云端和本地都存在同一文件的情况下,避免旧的云端数据覆盖新的本地数据
// Automatic synchronization mode prevents old cloud data from overwriting new local data https://github.com/siyuan-note/siyuan/issues/9601
logging.LogWarnf("prevent old upsert left [%s, %s, %s] overwrite right [%s, %s, %s]",
l[lPath].ID, l[lPath].Path, time.UnixMilli(l[lPath].Updated).Format("2006-01-02 15:04:05"),
rFile.ID, rFile.Path, time.UnixMilli(rFile.Updated).Format("2006-01-02 15:04:05"))
continue
}
upserts = append(upserts, l[lPath])
Expand Down

0 comments on commit 1c969bc

Please sign in to comment.