svn commit: r1589796 - in /subversion/branches/1.7.x-issue4480/subversion: mod_dav_svn/repos.c tests/cmdline/commit_tests.py

[ph...@apache.org]

Author: philip
Date: Thu Apr 24 17:05:51 2014
New Revision: 1589796

URL: http://svn.apache.org/r1589796
Log:
On 1.7.x-issue4480 branch.

* subversion/mod_dav_svn/repos.c
  (do_out_of_date_check): Reverse test so that OOD is correctly detected,
   make variables const to avoid compiler warning.

* subversion/tests/cmdline/commit_tests.py
  (commit_mergeinfo_ood): Change to construct that works in 1.7.

Modified:
    subversion/branches/1.7.x-issue4480/subversion/mod_dav_svn/repos.c
    subversion/branches/1.7.x-issue4480/subversion/tests/cmdline/commit_tests.py

Modified: subversion/branches/1.7.x-issue4480/subversion/mod_dav_svn/repos.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4480/subversion/mod_dav_svn/repos.c?rev=1589796&r1=1589795&r2=1589796&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4480/subversion/mod_dav_svn/repos.c (original)
+++ subversion/branches/1.7.x-issue4480/subversion/mod_dav_svn/repos.c Thu Apr 24 17:05:51 2014
@@ -1829,8 +1829,8 @@ do_out_of_date_check(dav_resource_combin
       svn_revnum_t youngest;
       svn_fs_root_t *youngest_root;
       svn_fs_root_t *rev_root;
-      svn_fs_id_t *youngest_id;
-      svn_fs_id_t *rev_id;
+      const svn_fs_id_t *youngest_id;
+      const svn_fs_id_t *rev_id;
 
       serr = svn_fs_youngest_rev(&youngest, comb->res.info->repos->fs,
                                  r->pool);
@@ -1879,7 +1879,7 @@ do_out_of_date_check(dav_resource_combin
       svn_fs_close_root(rev_root);
       svn_fs_close_root(youngest_root);
 
-      if (0 == svn_fs_compare_ids(youngest_id, rev_id))
+      if (0 != svn_fs_compare_ids(youngest_id, rev_id))
         {
           serr = svn_error_createf(SVN_ERR_RA_OUT_OF_DATE, NULL,
                                    "Directory '%s' is out of date",

Modified: subversion/branches/1.7.x-issue4480/subversion/tests/cmdline/commit_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4480/subversion/tests/cmdline/commit_tests.py?rev=1589796&r1=1589795&r2=1589796&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4480/subversion/tests/cmdline/commit_tests.py (original)
+++ subversion/branches/1.7.x-issue4480/subversion/tests/cmdline/commit_tests.py Thu Apr 24 17:05:51 2014
@@ -2911,7 +2911,8 @@ def commit_mergeinfo_ood(sbox):
 
   sbox.simple_commit()
 
-  sbox.simple_update(revision='5')
+  svntest.actions.run_and_verify_svn(None, None, [],
+                                     'update', '-r5', sbox.wc_dir)
 
   expected_output = [
     '--- Merging r5 into \'%s\':\n' % sbox.ospath('branch'),