public/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-07-02 02:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed: enhance conflict handling by adding settings check for document writes

Browse Source
This commit is contained in:
vorotamoroz
2026-06-08 10:47:34 +00:00
parent 2d8a285201
commit a40929c9e4
4 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/cli/testdeno/test-mirror.ts
+4
View File
@@ -39,6 +39,10 @@ Deno.test("mirror: storage <-> DB synchronisation", async (t) => {
// isConfigured=true is required for canProceedScan in the mirror command.
await markSettingsConfigured(settingsFile);
const data = JSON.parse(await Deno.readTextFile(settingsFile));
data.writeDocumentsIfConflicted = true;
await Deno.writeTextFile(settingsFile, JSON.stringify(data, null, 2));
// Copy settings to the DB directory (separated-path mode)
const dbSettings = workDir.join("db", "settings.json");
await Deno.copyFile(settingsFile, dbSettings);