Author: breser
Date: Tue Dec 18 19:33:19 2012
New Revision: 1423593
URL: http://svn.apache.org/viewvc?rev=1423593&view=rev
Log:
On '1.7.x-issue4263' branch: Merge r1421011 from trunk.
Resolved a minor conflict with some tests have Skip markers for ra_serf.
Modified:
subversion/branches/1.7.x-issue4263/ (props changed)
subversion/branches/1.7.x-issue4263/subversion/tests/cmdline/svnrdump_tests.py
Propchange: subversion/branches/1.7.x-issue4263/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1421011
Modified:
subversion/branches/1.7.x-issue4263/subversion/tests/cmdline/svnrdump_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4263/subversion/tests/cmdline/svnrdump_tests.py?rev=1423593&r1=1423592&r2=1423593&view=diff
==============================================================================
---
subversion/branches/1.7.x-issue4263/subversion/tests/cmdline/svnrdump_tests.py
(original)
+++
subversion/branches/1.7.x-issue4263/subversion/tests/cmdline/svnrdump_tests.py
Tue Dec 18 19:33:19 2012
@@ -375,6 +375,13 @@ def copy_bad_line_endings_dump(sbox):
expected_dumpfile_name="copy-bad-line-endings.expected.dump",
bypass_prop_validation=True)
+@XFail()
+@Issue(4263)
+def copy_bad_line_endings_load(sbox):
+ "load: inconsistent line endings in svn:* props"
+ run_load_test(sbox, "copy-bad-line-endings.dump",
+ expected_dumpfile_name="copy-bad-line-endings.expected.dump")
+
@Skip(svntest.main.is_ra_type_dav_serf)
def copy_bad_line_endings2_dump(sbox):
"dump: non-LF line endings in svn:* props"
@@ -796,6 +803,7 @@ test_list = [ None,
move_and_modify_in_the_same_revision_dump,
move_and_modify_in_the_same_revision_load,
copy_bad_line_endings_dump,
+ copy_bad_line_endings_load,
copy_bad_line_endings2_dump,
commit_a_copy_of_root_dump,
commit_a_copy_of_root_load,
