On Thu, Nov 06, 2008 at 03:14:04AM -0800, sbutler_at_tigris.org wrote:
> Author: sbutler
> Date: Thu Nov 6 03:14:03 2008
> New Revision: 34071
>
> Log:
> Make tree conflict tests check unversioned/nonexistent victims by default
> in the verify-status step.
>
> * subversion/tests/cmdline/svntest/actions.py
> (deep_trees_run_tests_scheme_for_update,
> deep_trees_run_tests_scheme_for_switch,
> deep_trees_run_tests_scheme_for_merge): Verify operation with
> "unquiet" status check.
>
> * subversion/tests/cmdline/switch_tests.py
> (tree_conflicts_on_switch_1_2,
> tree_conflicts_on_switch_2_1,
> tree_conflicts_on_switch_2_2,
> tree_conflicts_on_switch_3): Put unversioned/nonexistent victims
> in expected_status.
>
> * subversion/tests/cmdline/update_tests.py
> (tree_conflicts_on_update_1_2,
> tree_conflicts_on_update_2_1,
> tree_conflicts_on_update_2_2,
> tree_conflicts_on_update_3): Put unversioned/nonexistent victims
> in expected_status.
>
> * subversion/tests/cmdline/merge_tests.py
> (tree_conflicts_on_merge_local_ci_4_1,
> tree_conflicts_on_merge_local_ci_4_2,
> tree_conflicts_on_merge_local_ci_4_1,
> tree_conflicts_on_merge_local_ci_5_2,
> tree_conflicts_on_merge_local_ci_6): Put unversioned/nonexistent
> victims in expected_status.
>
> Modified:
> trunk/subversion/tests/cmdline/commit_tests.py
> trunk/subversion/tests/cmdline/merge_tests.py
> trunk/subversion/tests/cmdline/svntest/actions.py
> trunk/subversion/tests/cmdline/switch_tests.py
> trunk/subversion/tests/cmdline/update_tests.py
>
> Modified: trunk/subversion/tests/cmdline/commit_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/commit_tests.py?pathrev=34071&r1=34070&r2=34071
Hey Steve,
this change is not mentioned in the log message:
> ==============================================================================
> --- trunk/subversion/tests/cmdline/commit_tests.py Wed Nov 5 08:56:16 2008 (r34070)
> +++ trunk/subversion/tests/cmdline/commit_tests.py Thu Nov 6 03:14:03 2008 (r34071)
> @@ -2699,7 +2699,7 @@ test_list = [ None,
> commit_multiple_wc,
> commit_nonrecursive,
> failed_commit,
> - XFail(commit_out_of_date_deletions, svntest.main.is_ra_type_dav),
> + XFail(commit_out_of_date_deletions, svntest.main.is_ra_type_svn),
> commit_with_bad_log_message,
> commit_with_mixed_line_endings,
> commit_with_mixed_line_endings_in_ignored_part,
>
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-06 12:47:30 CET