You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/04/07 13:33:47 UTC
svn commit: r1089831 -
/subversion/trunk/subversion/tests/cmdline/update_tests.py
Author: rhuijben
Date: Thu Apr 7 11:33:47 2011
New Revision: 1089831
URL: http://svn.apache.org/viewvc?rev=1089831&view=rev
Log:
* subversion/tests/cmdline/update_tests.py
(tree_conflict_uc2_schedule_re_add): Update expected result to note that
this a working delete, not a base-delete.
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=1089831&r1=1089830&r2=1089831&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Thu Apr 7 11:33:47 2011
@@ -4941,7 +4941,7 @@ def tree_conflict_uc2_schedule_re_add(sb
'' : Item(status=' ', wc_rev='2'),
'A' : Item(status='A ', wc_rev='-', copied='+'),
'A/B' : Item(status=' ', wc_rev='-', copied='+'),
- 'A/B/lambda' : Item(status='D ', wc_rev='1'),
+ 'A/B/lambda' : Item(status='D ', wc_rev='-', copied='+'),
'A/B/E' : Item(status=' ', wc_rev='-', copied='+'),
'A/B/E/alpha' : Item(status='M ', wc_rev='-', copied='+'),
'A/B/E/beta' : Item(status=' ', wc_rev='-', copied='+'),