Author: rhuijben
Date: Thu Jan 31 21:35:49 2013
New Revision: 1441203
URL: http://svn.apache.org/viewvc?rev=1441203&view=rev
Log:
* subversion/tests/cmdline/svntest/actions.py
(run_and_verify_merge): On differences between output and dry run output
print what is compared, not half compared output, half full output.
Modified:
subversion/trunk/subversion/tests/cmdline/svntest/actions.py
Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=1441203&r1=1441202&r2=1441203&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Thu Jan 31 21:35:49 2013
@@ -1132,7 +1132,7 @@ def run_and_verify_merge(dir, rev1, rev2
for x in out_dry:
logger.warn(x)
logger.warn("The full merge output:")
- for x in out:
+ for x in merge_diff_out:
logger.warn(x)
logger.warn("=============================================================")
raise main.SVNUnmatchedError
|