You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by rh...@apache.org on 2012/12/20 16:11:09 UTC

svn commit: r1424513 - /subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py

Author: rhuijben
Date: Thu Dec 20 15:11:09 2012
New Revision: 1424513

URL: http://svn.apache.org/viewvc?rev=1424513&view=rev
Log:
* subversion/tests/cmdline/merge_authz_tests.py
  (mergeinfo_and_skipped_paths): Following up on r1424469, remove
    expected skip of D/G.

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=1424513&r1=1424512&r2=1424513&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py Thu Dec 20 15:11:09 2012
@@ -257,7 +257,6 @@ def mergeinfo_and_skipped_paths(sbox):
     })
   expected_skip = wc.State(A_COPY_2_path, {
     'B/E'     : Item(),
-    'D/G'       : Item(),
     'D/H/psi'   : Item(),
     })
   svntest.actions.run_and_verify_merge(A_COPY_2_path, '4', '8',