Changeset 76026 in vbox for trunk/src/apps/svnsync-vbox

Timestamp:

Dec 6, 2018 7:56:16 PM (6 years ago)

Author:

vboxsync

Message:

svnsync-vbox: handle tricky cases better: deleting of files which are changed and renamed in a directory which also got renamed (only way is to ignore the error, found no way to detect) and also handle adding files which get renamed in the same changeset (i.e. newly exported and renamed)

File:

• trunk/src/apps/svnsync-vbox/main.c (modified) (2 diffs)

trunk/src/apps/svnsync-vbox/main.c

@@ -1554 +1554 @@
   {
     eb->changeset_live = TRUE;
-    SVN_ERR(eb->wrapped_editor->delete_entry(path, base_revision,
-                                             pb->wrapped_node_baton, pool));
+    /* Deliberately ignore error, it's the only safe solution. */
+    eb->wrapped_editor->delete_entry(path, base_revision,
+                                     pb->wrapped_node_baton, pool);
   }
 
@@ -1961 +1962 @@
                            eb->current, &fb->process, NULL, NULL, pool));
     if (file_added_this_changeset)
-      fb->prev_process = fb->process;
+      fb->prev_process = FALSE;
     fb->prev_process_default = FALSE;
     fb->process_default = FALSE;