You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/10/14 13:39:12 UTC
svn commit: r1022470 -
/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
Author: philip
Date: Thu Oct 14 11:39:12 2010
New Revision: 1022470
URL: http://svn.apache.org/viewvc?rev=1022470&view=rev
Log:
* subversion/tests/cmdline/tree_conflict_tests.py
(lock_update_only): Expect the lock to be orphaned, this test is
XFAIL for an unexpected tree conflict, not an unexpected orphan.
Modified:
subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py?rev=1022470&r1=1022469&r2=1022470&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Thu Oct 14 11:39:12 2010
@@ -1053,7 +1053,7 @@ def lock_update_only(sbox):
expected_disk = main.greek_state.copy()
expected_disk.remove('iota')
expected_status = get_virginal_state(wc_dir, 1)
- expected_status.tweak('iota', status='D ')
+ expected_status.tweak('iota', status='D ', writelocked='O')
run_and_verify_update(wc_dir,
None, expected_disk, expected_status,
None, None, None, None, None, 1,