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/10 19:08:28 UTC
svn commit: r984127 -
/subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/diff_tests.py
Author: hwright
Date: Tue Aug 10 17:08:28 2010
New Revision: 984127
URL: http://svn.apache.org/viewvc?rev=984127&view=rev
Log:
On the ignore-mergeinfo branch:
Update test expections as a result of the merge inf r984122.
* subversion/tests/cmdline/diff_tests.py
(diff_ignore_mergeinfo): Add leading / on mergeinfo property output.
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=984127&r1=984126&r2=984127&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/diff_tests.py Tue Aug 10 17:08:28 2010
@@ -3038,12 +3038,12 @@ def diff_ignore_mergeinfo(sbox):
"Property changes on: A/B/E/beta\n",
"___________________________________________________________________\n",
"Added: svn:mergeinfo\n",
- " Merged bar:r1-2\n",
+ " Merged /bar:r1-2\n",
"\n",
"Property changes on: A/C\n",
"___________________________________________________________________\n",
"Added: svn:mergeinfo\n",
- " Merged bar:r1-2\n",
+ " Merged /bar:r1-2\n",
"\n",
"Property changes on: A/D/G/rho\n",
"___________________________________________________________________\n",
@@ -3051,12 +3051,12 @@ def diff_ignore_mergeinfo(sbox):
"## -0,0 +1 ##\n",
"+foo\n",
"Added: svn:mergeinfo\n",
- " Merged bar:r1-2\n",
+ " Merged /bar:r1-2\n",
"\n",
"Property changes on: A/D/H\n",
"___________________________________________________________________\n",
"Added: svn:mergeinfo\n",
- " Merged bar:r1-2\n",
+ " Merged /bar:r1-2\n",
"\n",
"Property changes on: A/D/H/chi\n",
"___________________________________________________________________\n",
@@ -3067,7 +3067,7 @@ def diff_ignore_mergeinfo(sbox):
"Property changes on: A/D/gamma\n",
"___________________________________________________________________\n",
"Added: svn:mergeinfo\n",
- " Merged bar:r1-2\n",
+ " Merged /bar:r1-2\n",
"\n",
"Property changes on: iota\n",
"___________________________________________________________________\n",