svn commit: r1813794 - in /subversion/trunk/subversion: libsvn_repos/reporter.c tests/cmdline/basic_tests.py

[da...@apache.org]

Author: danielsh
Date: Mon Oct 30 16:12:34 2017
New Revision: 1813794

URL: http://svn.apache.org/viewvc?rev=1813794&view=rev
Log:
Start fixing issue #4700: Null updates break last-changed-revision.

Patch by: stsp
          me

* subversion/libsvn_repos/reporter.c
  (update_entry): Use an API that considers not only the two endpoints
    but also the intervening history.

* subversion/tests/cmdline/basic_tests.py
  (null_update_last_changed_revision): Expect to pass.

Modified:
    subversion/trunk/subversion/libsvn_repos/reporter.c
    subversion/trunk/subversion/tests/cmdline/basic_tests.py

Modified: subversion/trunk/subversion/libsvn_repos/reporter.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/reporter.c?rev=1813794&r1=1813793&r2=1813794&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/reporter.c (original)
+++ subversion/trunk/subversion/libsvn_repos/reporter.c Mon Oct 30 16:12:34 2017
@@ -976,8 +976,8 @@ update_entry(report_baton_t *b, svn_revn
           SVN_ERR(svn_fs_props_different(&changed, s_root, s_path,
                                          b->t_root, t_path, pool));
           if (!changed)
-            SVN_ERR(svn_fs_contents_different(&changed, s_root, s_path,
-                                              b->t_root, t_path, pool));
+            SVN_ERR(svn_fs_contents_changed(&changed, s_root, s_path,
+                                            b->t_root, t_path, pool));
         }
 
       if ((distance == 0 || !changed) && !any_path_info(b, e_path)

Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=1813794&r1=1813793&r2=1813794&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Mon Oct 30 16:12:34 2017
@@ -3140,7 +3140,6 @@ def filtered_ls(sbox):
   exit_code, output, error = svntest.actions.run_and_verify_svn(
     [], [], 'ls', path, '--depth=infinity', '--search=*/*')
 
-@XFail()
 @Issue(4700)
 def null_update_last_changed_revision(sbox):
   "null 'update' updates last changed rev"