And now you just backed out the new test from test_list[] ...
On Fri, Apr 9, 2010 at 17:11, <rhuij...@apache.org> wrote: > Author: rhuijben > Date: Fri Apr 9 21:11:04 2010 > New Revision: 932617 > > URL: http://svn.apache.org/viewvc?rev=932617&view=rev > Log: > * subversion/tests/cmdline/merge_tests.py > (reintegrate_with_subtree_merges): Following up on r932469, fix accidental > change. > > Modified: > subversion/trunk/subversion/tests/cmdline/merge_tests.py > > Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py > URL: > http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=932617&r1=932616&r2=932617&view=diff > ============================================================================== > --- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original) > +++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Apr 9 > 21:11:04 2010 > @@ -18792,7 +18792,7 @@ def reintegrate_with_subtree_merges(sbox > 'D/H/omega' : Item("New content"), > }) > expected_A_skip = wc.State(A_COPY_path, {}) > - svntest.actions.run_and_verify_svn(A_path, None, None, > + svntest.actions.run_and_verify_merge(A_path, None, None, > sbox.repo_url + '/A_COPY', None, > expected_output, > expected_mergeinfo_output, > @@ -19118,7 +19118,6 @@ test_list = [ None, > merge_into_wc_for_deleted_branch, > reintegrate_with_self_referential_mergeinfo, > reintegrate_with_subtree_merges, > - foreign_repos_del_and_props > ] > > if __name__ == '__main__': > > >
