You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2014/06/30 10:54:25 UTC
svn commit: r1606648 -
/subversion/trunk/subversion/tests/cmdline/merge_tests.py
Author: ivan
Date: Mon Jun 30 08:54:25 2014
New Revision: 1606648
URL: http://svn.apache.org/r1606648
Log:
Follow-up to r1606182: Fix small typo in expected output.
Found by: rhuijben
* subversion/tests/cmdline/merge_tests.py
(merge_old_and_new_revs_from_renamed_file): Fix expected output.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1606648&r1=1606647&r2=1606648&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Mon Jun 30 08:54:25 2014
@@ -8150,7 +8150,7 @@ def merge_old_and_new_revs_from_renamed_
expected_status, None, wc_dir)
# Move mu to mu_MOVED
- svntest.actions.run_and_verify_svn(None, ['Committing transaction...',
+ svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
'Committed revision 4.\n'],
[], 'mv', '-m', 'mv mu to mu_MOVED',
mu_url, mu_MOVED_url)