Temp log of diffs

MarcelGeo · MarcelGeo · commit 4a91e3a4f74d · 2026-02-26T13:37:12.000+01:00
diff --git a/server/mergin/sync/models.py b/server/mergin/sync/models.py
@@ -1041,7 +1041,7 @@ def construct_checkpoint(self) -> bool:
                 project.storage.geodiff.concat_changes(diffs_paths, self.abs_path)
         except (GeoDiffLibError, GeoDiffLibConflictError):
             logging.error(
-                f"Geodiff: Failed to merge diffs for file {self.file_path_id}"
+                f"Geodiff: Failed to merge diffs for file {self.file_path_id}. Diffs: {diffs_paths}"
             )
             return False
 

Original file line number	Diff line number	Diff line change
`@@ -1041,7 +1041,7 @@ def construct_checkpoint(self) -> bool:`
`1041`	`1041`	`project.storage.geodiff.concat_changes(diffs_paths, self.abs_path)`
`1042`	`1042`	`except (GeoDiffLibError, GeoDiffLibConflictError):`
`1043`	`1043`	`logging.error(`
`1044`		`- f"Geodiff: Failed to merge diffs for file {self.file_path_id}"`
	`1044`	`+ f"Geodiff: Failed to merge diffs for file {self.file_path_id}. Diffs: {diffs_paths}"`
`1045`	`1045`	`)`
`1046`	`1046`	`return False`
`1047`	`1047`