You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/08/11 03:07:48 UTC
svn commit: r984278 -
/subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/diff_tests.py
Author: hwright
Date: Wed Aug 11 01:07:48 2010
New Revision: 984278
URL: http://svn.apache.org/viewvc?rev=984278&view=rev
Log:
On the ignore-mergeinfo branch:
* subversion/tests/cmdline/diff_tests.py
(diff_ignore_mergeinfo): Reorder diff output to match new expectations.
Followup to the merge in r984234
Modified:
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/diff_tests.py
Modified: subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/diff_tests.py?rev=984278&r1=984277&r2=984278&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/diff_tests.py Wed Aug 11 01:07:48 2010
@@ -3312,6 +3312,11 @@ def diff_ignore_mergeinfo(sbox):
"Added: svn:mergeinfo\n",
" Merged /bar:r1-2\n",
"\n",
+ "Property changes on: A/D/gamma\n",
+ "___________________________________________________________________\n",
+ "Added: svn:mergeinfo\n",
+ " Merged /bar:r1-2\n",
+ "\n",
"Property changes on: A/D/G/rho\n",
"___________________________________________________________________\n",
"Added: svn:bar\n",
@@ -3331,11 +3336,6 @@ def diff_ignore_mergeinfo(sbox):
"## -0,0 +1 ##\n",
"+foo\n",
"\n",
- "Property changes on: A/D/gamma\n",
- "___________________________________________________________________\n",
- "Added: svn:mergeinfo\n",
- " Merged /bar:r1-2\n",
- "\n",
"Property changes on: iota\n",
"___________________________________________________________________\n",
"Added: svn:bar\n",