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 2011/08/29 22:48:11 UTC
svn commit: r1162995 -
/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
Author: pburba
Date: Mon Aug 29 20:48:11 2011
New Revision: 1162995
URL: http://svn.apache.org/viewvc?rev=1162995&view=rev
Log:
Follow-up to r1162974. The fix for issue #3867 'reintegrate merges create
mergeinfo for non-existent paths' also fixes issue #3961 'reintegrate
merge of replaced source produces inaccurate mergeinfo'.
* subversion/tests/cmdline/merge_reintegrate_tests.py
(reintegrate_replaced_source): Remove XFail decorator and comment.
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=1162995&r1=1162994&r2=1162995&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py Mon Aug 29 20:48:11 2011
@@ -2419,7 +2419,6 @@ def no_source_subtree_mergeinfo(sbox):
#----------------------------------------------------------------------
@SkipUnless(server_has_mergeinfo)
@Issue(3961)
-@XFail()
def reintegrate_replaced_source(sbox):
"reintegrate a replaced source branch"
@@ -2511,9 +2510,6 @@ def reintegrate_replaced_source(sbox):
})
expected_status.tweak(wc_rev=12)
expected_disk = wc.State('', {
- # This test currently fails because the resulting mergeinfo is
- # /A_COPY:2-12, even though the changes in A_COPY:9 are *not*
- # present on A.
'' : Item(props={SVN_PROP_MERGEINFO : '/A_COPY:2-8,10-12'}),
'B' : Item(),
'mu' : Item("Branch edit.\n"),