[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH][merge-tracking]Fix 2 test failures over ra_svn

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-01-04 16:07:20 CET

Hi All,
Find the attached patch and log.

With regards
Kamesh Jayachandran

[[[

Fix 2 test failures over ra_svn.

* subversion/tests/cmdline/merge_tests.py
  (simple_property_merges, avoid_repeated_merge_using_inherited_merge_info):
   Remove FIXME markers.

* subversion/svnserve/serve.c
  (get_merge_info): Fixing the canonical_paths list population.

Patch by: kameshj
]]]

Index: subversion/tests/cmdline/merge_tests.py
===================================================================
--- subversion/tests/cmdline/merge_tests.py (revision 22899)
+++ subversion/tests/cmdline/merge_tests.py (working copy)
@@ -836,9 +836,6 @@
   alpha_path = os.path.join(wc_dir, 'B', 'E', 'alpha')
 
   # Cannot use run_and_verify_merge with a file target
- ### FIXME: This is failing over ra_svn. Merge info inherited from
- ### A2_url for /A:1-4 is being ignored, such that the merge is still
- ### occurring.
   svntest.actions.run_and_verify_svn(None, [], [], 'merge', '-r', '3:4',
                                      alpha_url, alpha_path)
   
@@ -3957,7 +3954,6 @@
 
   return expected_status
 
-### FIXME: This test is failing over ra_svn.
 def avoid_repeated_merge_using_inherited_merge_info(sbox):
   "use inherited merge info to avoid repeated merge"
 
Index: subversion/svnserve/serve.c
===================================================================
--- subversion/svnserve/serve.c (revision 22899)
+++ subversion/svnserve/serve.c (working copy)
@@ -1367,8 +1367,8 @@
         if (item->kind != SVN_RA_SVN_STRING)
           return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
                                   _("Path is not a string"));
- APR_ARRAY_IDX(canonical_paths, i, const char *) =
- svn_path_canonicalize(item->u.string->data, pool);
+ APR_ARRAY_PUSH(canonical_paths, const char *) =
+ svn_path_canonicalize(item->u.string->data, pool);
      }
 
   SVN_ERR(trivial_auth_request(conn, pool, b));

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jan 4 16:07:06 2007

This is an archived mail posted to the Subversion Dev mailing list.