Mercurial > hg > dav / file diff

--- a/dav/sync.c	Thu Mar 17 22:02:15 2016 +0100
+++ b/dav/sync.c	Fri Mar 18 12:38:30 2016 +0100
@@ -122,8 +122,9 @@
     
     fprintf(stderr, "Commands:\n");
     fprintf(stderr, "        pull [-c] <directory>\n");
-    //fprintf(stderr, "        push [-r] <directory>\n\n");
-    fprintf(stderr, "        push <directory>\n");
+    fprintf(stderr, "        push [-c] <directory>\n");
+    fprintf(stderr, "        resolve-conflicts <directory>\n");
+    fprintf(stderr, "        delete-conflicts <directory>\n");
     fprintf(stderr, "        trash-info <directory>\n");
     fprintf(stderr, "        empty-trash <directory>\n\n");
     
@@ -679,8 +680,9 @@
     int sync_error = 0;
     
     // upload all changed files
-    UcxList *resources = cmd_getoption(a, "read") ?
-            read_changes(dir, db) : local_scan(dir, db);
+    //UcxList *resources = cmd_getoption(a, "read") ?
+    //        read_changes(dir, db) : local_scan(dir, db);
+    UcxList *resources = local_scan(dir, db);
     
     UcxMap *lclres = ucx_map_new(db->resources->count);
     int ret = 0;