Mercurial > hg > dav / changeset

--- a/dav/sync.c	Mon Jun 12 21:43:12 2023 +0200
+++ b/dav/sync.c	Tue Jun 13 21:58:29 2023 +0200
@@ -4799,7 +4799,7 @@
     int ret = 0;
     
     // delete all conflict files
-    CxIterator i = cxMapIterator(db->conflict);
+    CxIterator i = cxMapIteratorValues(db->conflict);
     cx_foreach(LocalResource*, res, i) {
         printf("delete: %s\n", res->path);
         char *path = create_local_path(dir, res->path);

--- a/test/bin-test/test-dav-sync-pull-conflict.sh	Mon Jun 12 21:43:12 2023 +0200
+++ b/test/bin-test/test-dav-sync-pull-conflict.sh	Tue Jun 13 21:58:29 2023 +0200
@@ -177,6 +177,7 @@
 # don't check if the conflict file has this specific name
 
 $DAV_SYNC_BIN delete-conflicts test1b > tmp-sync/out.txt
+
 if [ $? -ne 0 ]; then
 	echo "test 3: delete-conflicts failed"
 	exit 2