Hi All,
Find the attached patch and log.
With regards
Kamesh Jayachandran
[[[
Fix 'merge_tests 39' to work with recent 'svntest parallelization' effort.
* subversion/tests/cmdline/merge_tests.py
(avoid_repeated_merge_using_inherited_merge_info):
'svntest.main.current_repo_url' -> 'sbox.repo_url'.
Patch by: Kamesh Jayachandran <kamesh@collab.net>
]]]
Index: subversion/tests/cmdline/merge_tests.py
===================================================================
--- subversion/tests/cmdline/merge_tests.py (revision 22389)
+++ subversion/tests/cmdline/merge_tests.py (working copy)
@@ -3968,7 +3968,7 @@
try:
os.chdir(svntest.main.work_dir)
svntest.actions.run_and_verify_merge(short_copy_of_B_path, '3', '4',
- svntest.main.current_repo_url + \
+ sbox.repo_url + \
'/A/B',
expected_output,
expected_disk,
@@ -4020,7 +4020,7 @@
try:
os.chdir(svntest.main.work_dir)
svntest.actions.run_and_verify_merge(short_copy_of_B_F_E_path, '3', '4',
- svntest.main.current_repo_url + \
+ sbox.repo_url + \
'/A/B/F/E',
expected_output,
expected_disk,
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Nov 22 12:10:21 2006