You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2010/10/01 23:11:09 UTC
svn commit: r1003651 -
/subversion/trunk/subversion/tests/cmdline/merge_tests.py
Author: pburba
Date: Fri Oct 1 21:11:09 2010
New Revision: 1003651
URL: http://svn.apache.org/viewvc?rev=1003651&view=rev
Log:
Tweak an XFailing issue #3324 merge test to account for 1.7 behavior.
* subversion/tests/cmdline/merge_tests.py
(merge_range_prior_to_rename_source_existence): Account for 1.7 merge
tracking behavior where subtrees with explicit mergeinfo *don't* get their
mergeinfo updated when the merge doesn't touch the subtree.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1003651&r1=1003650&r2=1003651&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Oct 1 21:11:09 2010
@@ -13951,7 +13951,7 @@ def merge_range_prior_to_rename_source_e
})
expected_status = wc.State(A_COPY_path, {
'' : Item(status=' M', wc_rev=10),
- 'B' : Item(status=' M', wc_rev=10),
+ 'B' : Item(status=' ', wc_rev=10),
'mu' : Item(status=' ', wc_rev=10),
'B/E' : Item(status=' ', wc_rev=10),
'B/E/alpha' : Item(status=' ', wc_rev=10),