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/16 20:47:39 UTC
svn commit: r1158419 -
/subversion/trunk/subversion/tests/cmdline/merge_tests.py
Author: pburba
Date: Tue Aug 16 18:47:39 2011
New Revision: 1158419
URL: http://svn.apache.org/viewvc?rev=1158419&view=rev
Log:
Fix expectations for issue #3989 test.
* subversion/tests/cmdline/merge_tests.py
(merged_deletion_causes_tree_conflict): Correct expected mergeinfo.
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=1158419&r1=1158418&r2=1158419&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Tue Aug 16 18:47:39 2011
@@ -17042,7 +17042,7 @@ def merged_deletion_causes_tree_conflict
})
expected_status.tweak(wc_rev=4)
expected_disk = wc.State('', {
- '' : Item(props={SVN_PROP_MERGEINFO : '/A/D/H:2-4'}),
+ '' : Item(props={SVN_PROP_MERGEINFO : '/A/D/H:3-4'}),
'chi' : Item("This is the file 'chi'.\n"),
'omega' : Item("This is the file 'omega'.\n"),
})