Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-27 11:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🐛 数据同步后冲突文件未生成文件历史索引 Fix https://github.com/siyuan-note/siyuan/issues/7303

Browse source
This commit is contained in:
Liang Ding 2023-02-08 21:41:13 +08:00
parent 8d42449f17
commit 228b40b0e8
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/repository.go
View file

@ -1074,6 +1074,7 @@ func processSyncMergeResult(exit, byHand bool, start time.Time, mergeResult *dej
if 0 < len(mergeResult.Conflicts) && Conf.Sync.GenerateConflictDoc {
// 云端同步发生冲突时生成副本 https://github.com/siyuan-note/siyuan/issues/5687
historyDir := filepath.Join(util.HistoryDir, mergeResult.Time.Format("2006-01-02-150405")+"-sync")
luteEngine := NewLute()
for _, file := range mergeResult.Conflicts {
if !strings.HasSuffix(file.Path, ".sy") {
@ -1097,6 +1098,7 @@ func processSyncMergeResult(exit, byHand bool, start time.Time, mergeResult *dej
resetTree(tree, "Conflicted")
createTreeTx(tree)
indexHistoryDir(filepath.Base(historyDir), luteEngine)
}
}