There are five tests that are (now) broken because we cannot properly
represent a local-add within a copied-subtree. This wasn't a problem
in the past because we didn't have "proper" copyfrom handling. Once
that got fixed, it started to expose further problems...
The dev@ list has some discussion occurring now about some schema
changes that should fix the problem. Once that discussion settles into
"Looks Good. Make It So.", then I'll start working on the problem, and
these tests will stop XFail'ing.
Cheers,
-g
On Wed, Apr 7, 2010 at 20:28, <gstein_at_apache.org> wrote:
> Author: gstein
> Date: Thu Apr 8 00:28:17 2010
> New Revision: 931738
>
> URL: http://svn.apache.org/viewvc?rev=931738&view=rev
> Log:
> XFail two more tests that throw errors because we cannot represent a
> local-add within a copied subtree.
>
> * subversion/tests/cmdline/diff_tests.py:
> (diff_in_renamed_folder): add comment about breakage
> (test_list): XFail the above test
>
> * subversion/tests/cmdline/merge_tests.py:
> (merge_catches_nonexistent_target): add comment about breakage
> (test_list): XFail the above test
>
> Modified:
> subversion/trunk/subversion/tests/cmdline/diff_tests.py
> subversion/trunk/subversion/tests/cmdline/merge_tests.py
>
> Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=931738&r1=931737&r2=931738&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
> +++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Thu Apr 8 00:28:17 2010
> @@ -2604,6 +2604,9 @@ def diff_in_renamed_folder(sbox):
> 'A/D/C' : Item(verb='Adding'),
> 'A/D/C/kappa' : Item(verb='Adding'),
> })
> + ### right now, we cannot denote that kappa is a local-add rather than a
> + ### child of the A/D/C copy. thus, it appears in the status output as a
> + ### (M)odified child.
> svntest.actions.run_and_verify_commit(wc_dir, expected_output,
> None, None, wc_dir)
>
> @@ -3134,7 +3137,7 @@ test_list = [ None,
> diff_weird_author,
> diff_ignore_whitespace,
> diff_ignore_eolstyle,
> - diff_in_renamed_folder,
> + XFail(diff_in_renamed_folder),
> diff_with_depth,
> diff_ignore_eolstyle_empty_lines,
> diff_backward_repos_wc_copy,
>
> Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=931738&r1=931737&r2=931738&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
> +++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Thu Apr 8 00:28:17 2010
> @@ -897,6 +897,9 @@ def merge_catches_nonexistent_target(sbo
> 'A/D/Q/tau' : Item(status=' ', wc_rev=2),
> 'A/D/Q/newfile' : Item(status=' ', wc_rev=2),
> })
> + ### right now, we cannot denote that Q/newfile is a local-add rather than
> + ### a child of the A/D/Q copy. thus, it appears in the status output as a
> + ### (M)odified child.
> svntest.actions.run_and_verify_commit(wc_dir,
> expected_output,
> expected_status,
> @@ -18820,7 +18823,7 @@ test_list = [ None,
> merge_with_implicit_target_using_r,
> merge_with_implicit_target_using_c,
> merge_with_implicit_target_and_revs,
> - SkipUnless(merge_catches_nonexistent_target,
> + SkipUnless(XFail(merge_catches_nonexistent_target),
> server_has_mergeinfo),
> SkipUnless(merge_tree_deleted_in_target,
> server_has_mergeinfo),
>
>
>
Received on 2010-04-08 02:32:41 CEST