Author: pburba
Date: Thu May 27 16:00:39 2010
New Revision: 948873
URL: http://svn.apache.org/viewvc?rev=948873&view=rev
Log:
Split merge_tests.py into three parts.
* subversion/tests/cmdline/merge_tests.py: Move all reintegrate and tree-
conflict related tests to the two new tests below. Note: There are still
a few tests remaining in merge_tests.py that are tagged with the 'This
test involves tree conflict' comment, but none of these are actually
testing tree conflict behavior per se. Most don't even produce tree
conflicts.
* subversion/tests/cmdline/merge_reintegrate_tests.py: New.
* subversion/tests/cmdline/merge_tree_conflict_tests.py: New.
Added:
subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
- copied, changed from r948821,
subversion/trunk/subversion/tests/cmdline/merge_tests.py
subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
- copied, changed from r948821,
subversion/trunk/subversion/tests/cmdline/merge_tests.py
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tests.py
