Changeset 48253 in vbox for trunk/src

Timestamp:

Sep 3, 2013 7:33:08 PM (11 years ago)

Author:

vboxsync

Message:

svnsync-vbox/main.c: rip out some incorrect code again, was worse than before

File:

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

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

@@ -1242 +1242 @@
   svn_boolean_t prev_process_default, process_default;
   svn_boolean_t prev_process_recursive, process_recursive;
-  svn_boolean_t added_ancestor_dir; /* This dir or its ancestors were added in this changeset */
   svn_boolean_t ignore_everything; /* Ignore operations on this dir/file. */
   svn_boolean_t ignore_everything_rec; /* Recursively ignore operations on subdirs/files. */
@@ -1611 +1610 @@
     {
       /* Genuinely add a new dir, referring to other revision/name if known. */
-      b->added_ancestor_dir = TRUE;
       SVN_ERR(eb->wrapped_editor->add_directory(path, pb->wrapped_node_baton,
                                                 copyfrom_path,
@@ -1677 +1675 @@
 
   DX(fprintf(stderr, "open_directory %s\n", path);)
-  db->added_ancestor_dir = pb->added_ancestor_dir;
   db->ignore_everything_rec = pb->ignore_everything_rec;
   db->ignore_everything = db->ignore_everything_rec;
@@ -1688 +1685 @@
     SVN_ERR(svn_ra_check_path(eb->from_session_prop, STRIP_LEADING_SLASH(path),
                               eb->current-1, &nodekind, pool));
-    dir_added_this_changeset =    db->added_ancestor_dir
-                               || (nodekind != svn_node_dir);
+    dir_added_this_changeset = (nodekind != svn_node_dir);
     if (!dir_added_this_changeset)
     {
@@ -1761 +1757 @@
         /* Directory appears due to changes to the process settings. */
         eb->changeset_live = TRUE;
-        db->added_ancestor_dir = TRUE;
         SVN_ERR(eb->wrapped_editor->add_directory(path, pb->wrapped_node_baton,
                                                   NULL, SVN_IGNORED_REVNUM, pool,