Author: rhuijben
Date: Thu Jul 1 23:08:39 2010
New Revision: 959807
URL: http://svn.apache.org/viewvc?rev=959807&view=rev
Log:
Following up on r959804, apply a few local property changes
in the test working copies.
* subversion/tests/cmdline/upgrade_tests.py
(do_x3_upgrade): Update expected status.
* subversion/tests/cmdline/upgrade_tests_data/wc-3x-1.4.0.tar.bz2
* subversion/tests/cmdline/upgrade_tests_data/wc-3x-1.4.6.tar.bz2
* subversion/tests/cmdline/upgrade_tests_data/wc-3x-1.6.12.tar.bz2
Replace working copies.
Modified:
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/wc-3x-1.4.0.tar.bz2
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/wc-3x-1.4.6.tar.bz2
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/wc-3x-1.6.12.tar.bz2
Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=959807&r1=959806&r2=959807&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Thu Jul 1
23:08:39 2010
@@ -374,22 +374,22 @@ def do_x3_upgrade(sbox):
'A/D/G' : Item(status=' ', wc_rev='2'),
'A/B_new' : Item(status='A ', copied='+', wc_rev='-'),
'A/B_new/B' : Item(status='A ', copied='+', wc_rev='-'),
- 'A/B_new/B/E' : Item(status=' ', copied='+', wc_rev='-'),
+ 'A/B_new/B/E' : Item(status=' M', copied='+', wc_rev='-'),
'A/B_new/B/E/alpha' : Item(status=' ', copied='+', wc_rev='-'),
'A/B_new/B/E/beta' : Item(status='R ', copied='+', wc_rev='-'),
'A/B_new/B/new' : Item(status='A ', copied='+', wc_rev='-'),
'A/B_new/B/lambda' : Item(status='R ', copied='+', wc_rev='-'),
'A/B_new/B/F' : Item(status=' ', copied='+', wc_rev='-'),
- 'A/B_new/E' : Item(status=' ', copied='+', wc_rev='-'),
- 'A/B_new/E/alpha' : Item(status=' ', copied='+', wc_rev='-'),
- 'A/B_new/E/beta' : Item(status='R ', copied='+', wc_rev='-'),
+ 'A/B_new/E' : Item(status=' M', copied='+', wc_rev='-'),
+ 'A/B_new/E/alpha' : Item(status=' M', copied='+', wc_rev='-'),
+ 'A/B_new/E/beta' : Item(status='RM', copied='+', wc_rev='-'),
'A/B_new/lambda' : Item(status='R ', copied='+', wc_rev='-'),
'A/B_new/new' : Item(status='A ', copied='+', wc_rev='-'),
'A/B_new/F' : Item(status=' ', copied='+', wc_rev='-'),
'A/B' : Item(status=' ', wc_rev='2'),
'A/B/E' : Item(status=' ', wc_rev='2'),
- 'A/B/E/beta' : Item(status='R ', copied='+', wc_rev='-'),
- 'A/B/E/alpha' : Item(status=' ', wc_rev='2'),
+ 'A/B/E/beta' : Item(status='RM', copied='+', wc_rev='-'),
+ 'A/B/E/alpha' : Item(status=' M', wc_rev='2'),
'A/B/F' : Item(status=' ', wc_rev='2'),
'A/B/lambda' : Item(status='R ', copied='+', wc_rev='-'),
'A/B/new' : Item(status='A ', copied='+', wc_rev='-'),
Modified:
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/wc-3x-1.4.0.tar.bz2
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/wc-3x-1.4.0.tar.bz2?rev=959807&r1=959806&r2=959807&view=diff
==============================================================================
Binary files - no diff available.
Modified:
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/wc-3x-1.4.6.tar.bz2
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/wc-3x-1.4.6.tar.bz2?rev=959807&r1=959806&r2=959807&view=diff
==============================================================================
Binary files - no diff available.
Modified:
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/wc-3x-1.6.12.tar.bz2
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/wc-3x-1.6.12.tar.bz2?rev=959807&r1=959806&r2=959807&view=diff
==============================================================================
Binary files - no diff available.
