Re: svn commit: r21453 - in trunk/subversion/tests/cmdline: . svntest

[Daniel Rall <dl...@collab.net>]

Thank you!  That'd been bothering me since I noticed all the
duplication while adding merge_add_over_versioned_file_conflicts().

On Tue, 12 Sep 2006, pburba@tigris.org wrote:

> Author: pburba
> Date: Tue Sep 12 07:43:41 2006
> New Revision: 21453
> 
> Log:
> Consolidate the many conflict file singleton handlers into one within tree.py.
> 
> The wheel has been reinvented, or at least copied, many times...
> 
> * subversion/tests/cmdline/basic_tests.py
>   (expect_extra_files): Remove.
>   (basic_conflict): Replace call to expect_extra_files() with
>   svntest.tree.detect_conflict_files().
> 
> * subversion/tests/cmdline/merge_tests.py
>   (detect_conflict_files): Remove.
>   (safe_property_merge, property_merge_from_branch,
>   cherry_pick_text_conflict, merge_add_over_versioned_file_conflicts):
>   Replace calls to detect_conflict_files() with
>   svntest.tree.detect_conflict_files().
> 
> * subversion/tests/cmdline/prop_tests.py
>   (detect_conflict_files): Remove.
>   (update_conflict_props): Replace call to detect_conflict_files() with
>   svntest.tree.detect_conflict_files().
> 
> * subversion/tests/cmdline/svntest/tree.py
>   (detect_conflict_files): New.
> 
> * subversion/tests/cmdline/update_tests.py
>   (detect_conflict_files): Remove.
>   (update_to_resolve_text_conflicts): Replace call to
>   detect_conflict_files() with svntest.tree.detect_conflict_files().