svn commit: r1597991 - in /subversion/trunk/subversion/mod_dav_svn: merge.c reports/log.c

[st...@apache.org]

Author: stefan2
Date: Wed May 28 12:37:33 2014
New Revision: 1597991

URL: http://svn.apache.org/r1597991
Log:
Follow-up to r1597989: Revert a few more mod_dav_svn changes.

* subversion/mod_dav_svn/merge.c
  (do_resources): Paths changes cannot be moves anymore.

* subversion/mod_dav_svn/reports/log.c
  (dav_svn__log_report): There is no "move-behavior" option anymore.

Found by: rhuijben

Modified:
    subversion/trunk/subversion/mod_dav_svn/merge.c
    subversion/trunk/subversion/mod_dav_svn/reports/log.c

Modified: subversion/trunk/subversion/mod_dav_svn/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/merge.c?rev=1597991&r1=1597990&r2=1597991&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/merge.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/merge.c Wed May 28 12:37:33 2014
@@ -155,8 +155,6 @@ do_resources(const dav_svn_repos *repos,
 
         case svn_fs_path_change_add:
         case svn_fs_path_change_replace:
-        case svn_fs_path_change_move:
-        case svn_fs_path_change_movereplace:
           send_self = TRUE;
           send_parent = TRUE;
           break;

Modified: subversion/trunk/subversion/mod_dav_svn/reports/log.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/reports/log.c?rev=1597991&r1=1597990&r2=1597991&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/reports/log.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/reports/log.c Wed May 28 12:37:33 2014
@@ -408,11 +408,6 @@ dav_svn__log_report(const dav_resource *
                                     resource->pool);
           APR_ARRAY_PUSH(paths, const char *) = target;
         }
-      else if (strcmp(child->name, "move-behavior") == 0)
-        {
-          const char *value = dav_xml_get_cdata(child, resource->pool, 1);
-          move_behavior = svn_move_behavior_from_word(value);
-        }
       /* else unknown element; skip it */
     }