You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2014/03/24 16:03:02 UTC
svn commit: r1580872 -
/subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py
Author: julianfoad
Date: Mon Mar 24 15:03:01 2014
New Revision: 1580872
URL: http://svn.apache.org/r1580872
Log:
Un-break the test for issue #4481. A follow-up to r1580867.
* subversion/tests/cmdline/merge_automatic_tests.py
(reintegrate_subtree_not_updated): Remove a spurious 'return' statement.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py?rev=1580872&r1=1580871&r2=1580872&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py Mon Mar 24 15:03:01 2014
@@ -1302,7 +1302,6 @@ def reintegrate_subtree_not_updated(sbox
sbox.simple_commit()
sbox.simple_update()
-return
# merge to 'D_2'. This merge previously failed with this error:
#
# svn: E195016: Reintegrate can only be used if revisions 5 through 9 were