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

Posted to commits@subversion.apache.org by pb...@apache.org on 2010/08/05 16:08:04 UTC

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

Author: pburba
Date: Thu Aug  5 14:08:04 2010
New Revision: 982628

URL: http://svn.apache.org/viewvc?rev=982628&view=rev
Log:
* subversion/tests/cmdline/merge_authz_tests.py
  (mergeinfo_and_skipped_paths): Remove a commented break inadvertently
   committed in r902509.

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=982628&r1=982627&r2=982628&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py Thu Aug  5 14:08:04 2010
@@ -442,7 +442,6 @@ def mergeinfo_and_skipped_paths(sbox):
     })
   expected_skip = wc.State(A_COPY_2_H_path, {})
   saved_cwd = os.getcwd()
-  #raise svntest.Failure("PTB")
   svntest.actions.run_and_verify_merge(A_COPY_2_H_path, '7', '9',
                                        sbox.repo_url + '/A/D/H', None,
                                        expected_output,