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/04 16:41:53 UTC
svn commit: r1153891 -
/subversion/branches/issue-3975/subversion/tests/cmdline/merge_tests.py
Author: pburba
Date: Thu Aug 4 14:41:52 2011
New Revision: 1153891
URL: http://svn.apache.org/viewvc?rev=1153891&view=rev
Log:
* subversion/tests/cmdline/merge_tests.py
(merge_adds_subtree_with_mergeinfo): Fix a typo in the expected mergeinfo
for this (still) XFailing test.
Modified:
subversion/branches/issue-3975/subversion/tests/cmdline/merge_tests.py
Modified: subversion/branches/issue-3975/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3975/subversion/tests/cmdline/merge_tests.py?rev=1153891&r1=1153890&r2=1153891&view=diff
==============================================================================
--- subversion/branches/issue-3975/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/branches/issue-3975/subversion/tests/cmdline/merge_tests.py Thu Aug 4 14:41:52 2011
@@ -16814,7 +16814,7 @@ def merge_adds_subtree_with_mergeinfo(sb
"More work on the A_COPY branch.\n" \
"A faux conflict resolution.\n",
props={SVN_PROP_MERGEINFO :
- '\/A/C/nu:9-11n/A_COPY/C/nu:10'}),
+ '/A/C/nu:9-11\n/A_COPY/C/nu:10'}),
'D' : Item(),
'D/G' : Item(),
'D/G/pi' : Item("This is the file 'pi'.\n"),