[[[
Split up big tree-conflicts tests into smaller tests, because tree-
conflicts-with-directory-victims are still under development. They may
be joined back together when they merely serve as regression tests.
* subversion/tests/cmdline/update_tests.py
(tree_conflicts_on_update): Split into smaller functions.
(tree_conflicts_on_update_1_1, tree_conflicts_on_update_1_2,
tree_conflicts_on_update_2_1, tree_conflicts_on_update_2_2,
tree_conflicts_on_update_3): New functions, as a result of
splitting up tree_conflicts_on_update().
* subversion/tests/cmdline/switch_tests.py
(tree_conflicts_on_switch): Split into smaller functions.
(tree_conflicts_on_switch_1_1, tree_conflicts_on_switch_1_2,
tree_conflicts_on_switch_2_1, tree_conflicts_on_switch_2_2,
tree_conflicts_on_switch_3): New functions, as a result of
splitting up tree_conflicts_on_switch().
* subversion/tests/cmdline/merge_tests.py
(tree_conflicts_on_merge_local_ci,
tree_conflicts_on_merge_no_local_ci): Fix use case numbering in
comments from 1..3 to 4..6. Split into smaller functions.
(tree_conflicts_on_merge_local_ci_4_1,
tree_conflicts_on_merge_local_ci_4_2,
tree_conflicts_on_merge_local_ci_5_1,
tree_conflicts_on_merge_local_ci_5_2,
tree_conflicts_on_merge_local_ci_6): New functions, as a result of
splitting up tree_conflicts_on_merge_local_ci().
(tree_conflicts_on_merge_no_local_ci_4_1,
tree_conflicts_on_merge_no_local_ci_4_2,
tree_conflicts_on_merge_no_local_ci_5_1,
tree_conflicts_on_merge_no_local_ci_5_2,
tree_conflicts_on_merge_no_local_ci_6): New functions, as a result
of splitting up tree_conflicts_on_merge_no_local_ci().
]]]
--
Neels Hofmeyr -- elego Software Solutions GmbH
Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany
phone: +49 30 23458696 mobile: +49 177 2345869 fax: +49 30 23458695
http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin
Handelsreg: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
Received on 2008-08-21 05:31:03 CEST