Author: pburba
Date: Thu Feb 28 20:16:39 2013
New Revision: 1451327
URL: http://svn.apache.org/r1451327
Log:
Restore test for issue #3577 which got accidentally got removed by some
jerk[1] way back in r953878.
* subversion/tests/cmdline/merge_reintegrate_tests.py
(reintegrate_with_subtree_merges): Adjust expected mergeinfo recording
notifications as per the issue #3671 fixes in r961055.
(test_list): Tests are awesome. Actually running them is even better.
[1] that would be me
Modified:
subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py?rev=1451327&r1=1451326&r2=1451327&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
(original)
+++ subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py Thu
Feb 28 20:16:39 2013
@@ -1916,7 +1916,7 @@ def reintegrate_with_subtree_merges(sbox
'mu' : Item(status='U '),
})
expected_mergeinfo_output = wc.State(A_path, {
- '' : Item(status=' G'),
+ '' : Item(status=' U'),
})
expected_elision_output = wc.State(A_path, {
})
@@ -1965,14 +1965,14 @@ def reintegrate_with_subtree_merges(sbox
})
expected_A_skip = wc.State(A_COPY_path, {})
run_and_verify_reintegrate(A_path,
- sbox.repo_url + '/A_COPY',
- expected_output,
- expected_mergeinfo_output,
- expected_elision_output,
- expected_A_disk,
- expected_A_status,
- expected_A_skip,
- None, 1, 1)
+ sbox.repo_url + '/A_COPY',
+ expected_output,
+ expected_mergeinfo_output,
+ expected_elision_output,
+ expected_A_disk,
+ expected_A_status,
+ expected_A_skip,
+ None, 1, 1)
#----------------------------------------------------------------------
# Test for issue #3654 'added subtrees with mergeinfo break reintegrate'.
@@ -2774,6 +2774,7 @@ test_list = [ None,
reintegrate_with_subtree_mergeinfo,
multiple_reintegrates_from_the_same_branch,
reintegrate_with_self_referential_mergeinfo,
+ reintegrate_with_subtree_merges,
added_subtrees_with_mergeinfo_break_reintegrate,
two_URL_merge_removes_valid_mergeinfo_from_target,
reintegrate_creates_bogus_mergeinfo,
