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 2015/11/11 11:59:46 UTC
svn commit: r1713808 -
/subversion/branches/move-tracking-2/subversion/tests/cmdline/svnmover_tests.py
Author: julianfoad
Date: Wed Nov 11 10:59:46 2015
New Revision: 1713808
URL: http://svn.apache.org/viewvc?rev=1713808&view=rev
Log:
On the 'move-tracking-2' branch: Update test expectations, following r1713718.
* subversion/tests/cmdline/svnmover_tests.py
(tree_conflict_detect): Expect the commit to raise an error, not the merge.
Modified:
subversion/branches/move-tracking-2/subversion/tests/cmdline/svnmover_tests.py
Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/svnmover_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/svnmover_tests.py?rev=1713808&r1=1713807&r2=1713808&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/svnmover_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/svnmover_tests.py Wed Nov 11 10:59:46 2015
@@ -1477,7 +1477,7 @@ def tree_conflict_detect(sbox,
test_svnmover2(sbox, 'br1', None,
side2_cmds)
# merge
- xtest_svnmover(sbox.repo_url, 'E123456: Merge failed because of conflicts',
+ xtest_svnmover(sbox.repo_url, 'E123456: Cannot commit because there are unresolved conflicts',
'merge trunk br1 trunk@2')
# A simple single-element tree conflict