You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by st...@apache.org on 2013/02/06 22:46:59 UTC

svn commit: r1443232 - /subversion/trunk/subversion/tests/cmdline/update_tests.py

Author: stsp
Date: Wed Feb  6 21:46:59 2013
New Revision: 1443232

URL: http://svn.apache.org/viewvc?rev=1443232&view=rev
Log:
* subversion/tests/cmdline/update_tests.py
  (break_moved_replaced_dir): Fix comment to match reality.

Modified:
    subversion/trunk/subversion/tests/cmdline/update_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1443232&r1=1443231&r2=1443232&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Wed Feb  6 21:46:59 2013
@@ -6184,8 +6184,7 @@ def break_moved_replaced_dir(sbox):
 
   # Now resolve the conflict, using --accept=theirs-conflict.
   # This should break the move of A/B/E to A/B/E2, leaving A/B/E2
-  # as a copy. A/B/E is not reverted since it has been replaced
-  # by a new A/B/E.
+  # as a copy. A/B/E is not reverted.
   svntest.actions.run_and_verify_svn("resolve failed", None, [],
                                      'resolve', '--recursive',
                                      '--accept=theirs-conflict', wc_dir)