Author: rhuijben
Date: Sat Dec 22 22:54:48 2012
New Revision: 1425365
URL: http://svn.apache.org/viewvc?rev=1425365&view=rev
Log:
* subversion/tests/cmdline/merge_authz_tests.py
(mergeinfo_and_skipped_paths):
Following up on r1425271 and r1424513, reintroduce expected skip.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py?rev=1425365&r1=1425364&r2=1425365&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py Sat Dec 22
22:54:48 2012
@@ -256,8 +256,9 @@ def mergeinfo_and_skipped_paths(sbox):
'C' : Item(),
})
expected_skip = wc.State(A_COPY_2_path, {
- 'B/E' : Item(),
- 'D/H/psi' : Item(),
+ 'B/E' : Item(),
+ 'D/G/rho' : Item(),
+ 'D/H/psi' : Item(),
})
svntest.actions.run_and_verify_merge(A_COPY_2_path, '4', '8',
sbox.repo_url + '/A', None,
