Hi All,
Find the attached patch and log.
With regards
Kamesh Jayachandran
[[[
use SVN_PROP_MERGE_INFO rather than 'svn:mergeinfo'.
* subversion/tests/cmdline/svntest/main.py
(global): define SVN_PROP_MERGE_INFO.
* subversion/tests/cmdline/copy_tests.py
(global): import SVN_PROP_MERGE_INFO.
(copy_replace_with_props, wc_to_repos, repos_to_wc, copy_added_paths_to_URL
copy_peg_rev_local_files, copy_peg_rev_local_dirs, copy_peg_rev_url):
'svn:mergeinfo' -> SVN_PROP_MERGE_INFO
* subversion/tests/cmdline/merge_tests.py
(global): import SVN_PROP_MERGE_INFO.
(mergeinfo_inheritance_and_discontinuous_ranges, merge_to_switched_path):
'svn:mergeinfo' -> SVN_PROP_MERGE_INFO
Patch by: kameshj
]]]
Index: subversion/tests/cmdline/svntest/main.py
===================================================================
--- subversion/tests/cmdline/svntest/main.py (revision 24952)
+++ subversion/tests/cmdline/svntest/main.py (working copy)
@@ -158,6 +158,9 @@
# this dir, so there's one point at which to mount, e.g., a ramdisk.
work_dir = "svn-test-work"
+# Constant for the merge info property.
+SVN_PROP_MERGE_INFO = "svn:mergeinfo"
+
# Where we want all the repositories and working copies to live.
# Each test will have its own!
general_repo_dir = os.path.join(work_dir, "repositories")
Index: subversion/tests/cmdline/copy_tests.py
===================================================================
--- subversion/tests/cmdline/copy_tests.py (revision 24952)
+++ subversion/tests/cmdline/copy_tests.py (working copy)
@@ -23,6 +23,8 @@
import svntest
from svntest import SVNAnyOutput
+from svntest.main import SVN_PROP_MERGE_INFO
+
# (abbreviation)
Skip = svntest.testcase.Skip
XFail = svntest.testcase.XFail
@@ -164,7 +166,7 @@
# Verify both content and props have been copied
props = { 'phony-prop' : '*' }
if not wc_copy or contact_repos_for_merge_info:
- props['svn:mergeinfo'] = '/A/D/G/pi:1-2'
+ props[SVN_PROP_MERGE_INFO] = '/A/D/G/pi:1-2'
expected_disk.tweak('A/D/G/rho',
contents="This is the file 'pi'.\n",
props=props)
@@ -921,7 +923,7 @@
(H2_url, '/A/D/H:1'),
(H2_url + '/beta', '/A/B/E/beta:1')):
svntest.actions.run_and_verify_svn(None, [merge_info + '\n'], [],
- 'propget', 'svn:mergeinfo', dest)
+ 'propget', SVN_PROP_MERGE_INFO, dest)
# check local property was copied
svntest.actions.run_and_verify_svn(None, ['bar\n'], [], 'propget', 'foo',
@@ -1052,7 +1054,7 @@
# Validate that the merge info of the copy destination matches the
# implied merge info from the copy source.
svntest.actions.run_and_verify_svn(None, ['/A/B:1\n'], [],
- 'propget', 'svn:mergeinfo',
+ 'propget', SVN_PROP_MERGE_INFO,
os.path.join(D_dir, 'B'))
#----------------------------------------------------------------------
@@ -2751,7 +2753,7 @@
# Validate that the merge info of the copy destination matches the
# implied merge info from the copy source.
svntest.actions.run_and_verify_svn(None, ['\n'], [], 'propget',
- 'svn:mergeinfo', upsilon_copy_URL)
+ SVN_PROP_MERGE_INFO, upsilon_copy_URL)
# Copy added dir A/D/I to URL://A/D/G/I
I_copy_URL = sbox.repo_url + '/A/D/G/I'
@@ -3320,7 +3322,7 @@
expected_disk.tweak('A/D/H/psi', contents=iota_text)
expected_disk.add({
'sigma' : Item(contents=psi_text,
- props={ 'svn:mergeinfo' : '/A/D/H/psi:1' }),
+ props={ SVN_PROP_MERGE_INFO : '/A/D/H/psi:1' }),
})
actual_disk = svntest.tree.build_tree_from_wc(wc_dir, 3)
@@ -3389,7 +3391,7 @@
'A/B/E/rho' : Item(contents="This is the file 'rho'.\n"),
'A/B/E/tau' : Item(contents="This is the file 'tau'.\n"),
'A/D/G/beta' : Item(contents="This is the file 'beta'.\n"),
- 'A/J' : Item(props={ 'svn:mergeinfo' : '/A/B/E:1' }),
+ 'A/J' : Item(props={ SVN_PROP_MERGE_INFO : '/A/B/E:1' }),
'A/J/alpha' : Item(contents="This is the file 'alpha'.\n"),
'A/J/beta' : Item(contents="This is the file 'beta'.\n"),
})
@@ -3437,7 +3439,7 @@
# Validate that the merge info of the copy destination matches the
# implied merge info from the copy source.
svntest.actions.run_and_verify_svn(None, ['/A/D/H/psi:1\n'], [],
- 'propget', 'svn:mergeinfo', sigma_url)
+ 'propget', SVN_PROP_MERGE_INFO, sigma_url)
# Update to HEAD and verify disk contents
expected_output = svntest.wc.State(wc_dir, {
Index: subversion/tests/cmdline/merge_tests.py
===================================================================
--- subversion/tests/cmdline/merge_tests.py (revision 24952)
+++ subversion/tests/cmdline/merge_tests.py (working copy)
@@ -28,8 +28,7 @@
XFail = svntest.testcase.XFail
Skip = svntest.testcase.Skip
-# Constant for the merge info property.
-SVN_PROP_MERGE_INFO = "svn:mergeinfo"
+from svntest.main import SVN_PROP_MERGE_INFO
def shorten_path_kludge(path):
'''Search for the comment entitled "The Merge Kluge" elsewhere in
@@ -5322,7 +5321,8 @@
### wipe all ranges for a file due to the bug pointed out in r24645.
mu_copy_path = os.path.join(A_COPY_path, 'mu')
svntest.actions.run_and_verify_svn(None,
- ["property 'svn:mergeinfo' set on '" +
+ ["property '" + SVN_PROP_MERGE_INFO
+ + "' set on '" +
mu_copy_path + "'\n"], [], 'propset',
SVN_PROP_MERGE_INFO, '', mu_copy_path)
# ...and confirm that we can commit the wiped merge info...
@@ -5559,9 +5559,9 @@
"A " + G_COPY_path + "\n"])
expected = svntest.actions.UnorderedOutput(
["Properties on '" + A_COPY_D_path + "':\n",
- " svn:mergeinfo : /A/D/:4\n",
+ " " + SVN_PROP_MERGE_INFO + " : /A/D/:4\n",
"Properties on '" + A_COPY_D_G_path + "':\n",
- " svn:mergeinfo : /A/D/G:4\n"])
+ " " + SVN_PROP_MERGE_INFO +" : /A/D/G:4\n"])
svntest.actions.run_and_verify_svn(None,
expected, [],
'pl', '-vR', A_COPY_D_path)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon May 7 18:54:48 2007