Author: julianfoad
Date: Wed Jan 21 18:30:36 2015
New Revision: 1653622
URL: http://svn.apache.org/r1653622
Log:
Add another case to the regression tests for issue #4551 'svnrdump load
commits wrong properties, or fails, on a non-deltas dumpfile'.
A follow-up to r1652200 which did the same in the other test for this issue.
* subversion/tests/cmdline/svnrdump_tests.py
(load_non_deltas_replace_copy_with_props): Also test a child of a copy, as a
more
extensive fix is required to get this case right.
Modified:
subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py?rev=1653622&r1=1653621&r2=1653622&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py Wed Jan 21
18:30:36 2015
@@ -868,7 +868,7 @@ def load_non_deltas_replace_copy_with_pr
sbox.build()
# Set props on a file and on a dir
- sbox.simple_propset('p', 'v', 'A/mu', 'A/B')
+ sbox.simple_propset('p', 'v', 'A/mu', 'A/B', 'A/B/E')
sbox.simple_commit()
sbox.simple_update() # avoid mixed-rev
@@ -878,7 +878,7 @@ def load_non_deltas_replace_copy_with_pr
sbox.simple_copy('A/mu@2', 'A/D/gamma')
sbox.simple_copy('A/B@2', 'A/C')
# On the copy, delete a prop that isn't present on the replaced node
- sbox.simple_propdel('p', 'A/D/gamma', 'A/C')
+ sbox.simple_propdel('p', 'A/D/gamma', 'A/C', 'A/C/E')
sbox.simple_commit()
@@ -894,7 +894,7 @@ def load_non_deltas_replace_copy_with_pr
[], 0, 'load', new_repo_url)
# Check that property 'p' really was deleted on each copied node
- for tgt_path in ['A/D/gamma', 'A/C']:
+ for tgt_path in ['A/D/gamma', 'A/C', 'A/C/E']:
_, out, _ = svntest.main.run_svn(None, 'proplist',
new_repo_url + '/' + tgt_path)
expected = []
