From 228b40b0e8d93df5fe2117d74b503736747dc69e Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 8 Feb 2023 21:41:13 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=90=8E=E5=86=B2=E7=AA=81=E6=96=87=E4=BB=B6=E6=9C=AA=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=96=87=E4=BB=B6=E5=8E=86=E5=8F=B2=E7=B4=A2=E5=BC=95?= =?UTF-8?q?=20Fix=20https://github.com/siyuan-note/siyuan/issues/7303?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/repository.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 10033b499..f53f4ae96 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -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) } }