You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/05/15 17:35:32 UTC
svn commit: r1338755 - in /subversion/branches/1.7.x-issue4153: ./
subversion/tests/cmdline/diff_tests.py
Author: stsp
Date: Tue May 15 15:35:32 2012
New Revision: 1338755
URL: http://svn.apache.org/viewvc?rev=1338755&view=rev
Log:
On the 1.7.x-issue4153 branch, merge r1338748 from trunk (clean merge).
Modified:
subversion/branches/1.7.x-issue4153/ (props changed)
subversion/branches/1.7.x-issue4153/subversion/tests/cmdline/diff_tests.py
Propchange: subversion/branches/1.7.x-issue4153/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1338748
Modified: subversion/branches/1.7.x-issue4153/subversion/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4153/subversion/tests/cmdline/diff_tests.py?rev=1338755&r1=1338754&r2=1338755&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4153/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/branches/1.7.x-issue4153/subversion/tests/cmdline/diff_tests.py Tue May 15 15:35:32 2012
@@ -3756,6 +3756,9 @@ def diff_deleted_url(sbox):
"@@ -1 +0,0 @@\n",
"-This is the file 'psi'.\n",
]
+
+ # Files in diff may be in any order.
+ expected_output = svntest.verify.UnorderedOutput(expected_output)
svntest.actions.run_and_verify_svn(None, expected_output, [],
'diff', '-c2',
sbox.repo_url + '/A/D/H')