Hi All,
Find the attached patch and log.
With regards
Kamesh Jayachandran
[[[
Across our testsuite we could see code of the following nature
expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, some_rev)
expected_status.tweak(wc_rev=some_other_rev)
which is functionally equivalent to
expected_status = svntest.actions.get_virginal_state(sbox.wc_dir,
some_other_rev)
This equivalent form avoids one loop over greek tree.
* subversion/tests/cmdline/basic_tests.py
(basic_commit, basic_update,
basic_corruption, basic_merging_update,
basic_conflict, basic_checkout_deleted,
basic_node_kind_change):
Get the expected_status tree directly with the correct revision, instead
of getting a wrong rev and tweaking it afterwards.
* subversion/tests/cmdline/commit_tests.py
(commit_multiple_targets, commit_multiple_targets_2,
nested_dir_replacements, hudson_part_1,
hudson_part_1_variation_1, hudson_part_1_variation_2,
hudson_part_2, hudson_part_2_1,
merge_mixed_revisions, commit_uri_unsafe,
commit_deleted_edited, commit_out_of_date_deletions,
commit_same_folder_in_targets):
Same as above.
* subversion/tests/cmdline/copy_tests.py
(basic_copy_and_move_files, receive_copy_in_update,
copy_copied_file_and_dir, move_copied_file_and_dir,
move_moved_file_and_dir, move_file_within_moved_dir,
move_file_out_of_moved_dir, move_dir_within_moved_dir,
move_dir_out_of_moved_dir, move_file_back_and_forth,
copy_move_added_paths):
Same as above.
* subversion/tests/cmdline/diff_tests.py
(dont_diff_binary_file, diff_base_to_repos,
diff_deleted_in_head, diff_force):
Same as above.
* subversion/tests/cmdline/export_tests.py
(export_with_state_deleted):
Same as above.
* subversion/tests/cmdline/history_tests.py
(cat_traces_renames):
Same as above.
* subversion/tests/cmdline/lock_tests.py
(commit_file_keep_lock, commit_file_unlock,
commit_propchange, lock_status,
stolen_lock_status, broken_lock_status,
revert_lock, commit_xml_unsafe_file_unlock):
Same as above.
* subversion/tests/cmdline/revert_tests.py
(revert_replaced_file_without_props):
Same as above.
* subversion/tests/cmdline/special_tests.py
(general_symlink, copy_tree_with_symlink,
replace_symlink_with_file, remove_symlink):
Same as above.
* subversion/tests/cmdline/stat_tests.py
(status_update_with_nested_adds):
Same as above.
* subversion/tests/cmdline/svnlook_tests.py
(test_misc, delete_file_in_moved_dir):
Same as above.
* subversion/tests/cmdline/svnversion_tests.py
(svnversion_test):
Same as above.
* subversion/tests/cmdline/switch_tests.py
(relocate_deleted_missing_copied, failed_anchor_is_target,
obstructed_switch, refresh_read_only_attribute,
relocate_and_propset):
Same as above.
* subversion/tests/cmdline/trans_tests.py
(update_modified_with_translation, cat_keyword_expansion,
propset_commit_checkout_nocrash):
Same as above.
* subversion/tests/cmdline/update_tests.py
(update_binary_file, update_binary_file_2,
receive_overlapping_same_change, update_to_resolve_text_conflicts,
update_after_add_rm_deleted, update_replace_dir,
update_single_file, prop_update_on_scheduled_delete,
update_deleted_missing_dir, another_hudson_problem,
update_deleted_targets, non_recursive_update,
nested_in_read_only, update_xml_unsafe_dir,
forced_update, forced_update_failures,
update_wc_on_windows_drive):
Same as above.
Patch by: Kamesh Jayachandran <kamesh@collab.net>
]]]
Index: subversion/tests/cmdline/basic_tests.py
===================================================================
--- subversion/tests/cmdline/basic_tests.py (revision 22145)
+++ subversion/tests/cmdline/basic_tests.py (working copy)
@@ -131,8 +131,7 @@
# Create expected status tree; all local revisions should be at 1,
# but mu and rho should be at revision 2.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', 'A/D/G/rho', wc_rev=2)
svntest.actions.run_and_verify_commit (wc_dir,
@@ -170,8 +169,7 @@
# Create expected status tree; all local revisions should be at 1,
# but mu and rho should be at revision 2.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', 'A/D/G/rho', wc_rev=2)
# Commit.
@@ -283,8 +281,7 @@
# Create expected status tree; all local revisions should be at 1,
# but mu should be at revision 2.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=2)
# Modify mu's text-base, so we get a checksum failure the first time
@@ -397,8 +394,7 @@
# Create expected status tree; all local revisions should be at 1,
# but mu and rho should be at revision 2.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', 'A/D/G/rho', wc_rev=2)
# Initial commit.
@@ -425,8 +421,7 @@
# Create expected status tree; all local revisions should be at 1,
# but mu and rho should be at revision 3.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', 'A/D/G/rho', wc_rev=3)
# Commit.
@@ -514,8 +509,7 @@
# Create expected status tree; all local revisions should be at 1,
# but mu and rho should be at revision 2.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', 'A/D/G/rho', wc_rev=2)
# Commit.
@@ -1106,8 +1100,7 @@
'A/D' : Item(verb='Deleting'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/D', 'A/D/G', 'A/D/G/rho', 'A/D/G/pi', 'A/D/G/tau',
'A/D/H', 'A/D/H/chi', 'A/D/H/psi', 'A/D/H/omega',
'A/D/gamma')
@@ -1160,8 +1153,7 @@
expected_output = wc.State(wc_dir, {
'A/D/gamma' : Item(verb='Deleting'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/D/gamma')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, expected_status,
Index: subversion/tests/cmdline/commit_tests.py
===================================================================
--- subversion/tests/cmdline/commit_tests.py (revision 22145)
+++ subversion/tests/cmdline/commit_tests.py (working copy)
@@ -263,8 +263,7 @@
# Create expected status tree; all local revisions should be at 1,
# but our three targets should be at 2.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D/H/psi', 'A/B/lambda', 'A/D/G/pi', wc_rev=2)
# rho and omega should still display as locally modified:
@@ -321,8 +320,7 @@
# Create expected status tree; all local revisions should be at 1,
# but our four targets should be at 2.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D/H/psi', 'A/B/lambda', 'A/D/G/pi', 'A/D/H/omega',
wc_rev=2)
@@ -534,8 +532,7 @@
})
# Created expected status tree.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D', 'A/D/H', wc_rev=2)
expected_status.add({
'A/D/bloo' : Item(status=' ', wc_rev=2),
@@ -575,8 +572,7 @@
})
# After committing, status should show no sign of gamma.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/D/gamma')
# Commit the deletion of gamma and verify.
@@ -628,8 +624,7 @@
})
# After committing, status should show no sign of H or its contents
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/D/H', 'A/D/H/chi', 'A/D/H/omega', 'A/D/H/psi')
# Commit the deletion of H and verify.
@@ -681,8 +676,7 @@
})
# After committing, status should show no sign of gamma.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/D/gamma')
# Commit the deletion of gamma and verify.
@@ -699,8 +693,7 @@
# For sanity, examine status: it should show a revision 2 tree with
# gamma scheduled for addition.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D/gamma', wc_rev=0, status='A ')
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -711,8 +704,7 @@
})
# After committing, status should show only gamma at revision 3.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D/gamma', wc_rev=3)
svntest.actions.run_and_verify_commit (wc_dir,
@@ -746,8 +738,7 @@
})
# After committing, status should show no sign of gamma.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/D/gamma')
# Commit the deletion of gamma and verify.
@@ -808,8 +799,7 @@
'A/D/G/psi' : Item(verb='Adding'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/D/H/chi')
expected_status.remove('A/D/H/omega')
expected_status.remove('A/D/H/psi')
@@ -927,8 +917,7 @@
'A/D/H/chi' : Item(verb='Sending'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('iota', 'A/D/H/chi', wc_rev=2)
svntest.actions.run_and_verify_commit (wc_dir,
@@ -962,8 +951,7 @@
expected_output = svntest.wc.State(wc_dir, {
'iota' : Item(verb='Sending'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D/H', 'A/D/H/omega', 'A/D/H/chi', 'A/D/H/psi',
wc_rev=2)
expected_status.tweak('iota', wc_rev=3)
@@ -980,8 +968,7 @@
expected_output = svntest.wc.State(wc_dir, {
'A/D/H/chi' : Item(verb='Sending'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 4)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D/H/chi', wc_rev=4)
expected_status.tweak('A/D/H', 'A/D/H/omega', 'A/D/H/psi', wc_rev=2)
expected_status.tweak('iota', wc_rev=3)
@@ -996,8 +983,7 @@
expected_output = svntest.wc.State(wc_dir, {
'iota' : Item(verb='Sending'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 5)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D/H', 'A/D/H/omega', 'A/D/H/psi', wc_rev=2)
expected_status.tweak('A/D/H/chi', wc_rev=4)
expected_status.tweak('iota', wc_rev=5)
@@ -1040,8 +1026,7 @@
'iota' : Item(verb='Sending'),
'A/D/H/omega' : Item(verb='Sending'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 6)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('iota', 'A/D/H/omega', wc_rev=6)
expected_status.tweak('A/D/H', 'A/D/H/psi', wc_rev=2)
expected_status.tweak('A/D/H/chi', wc_rev=4)
@@ -1118,10 +1103,7 @@
'A/' + nasty_name : Item(verb='Adding'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
-
- # Items in the status list are all at rev 1
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
# Items in our add list will be at rev 2
for item in expected_output.desc.keys():
@@ -1162,9 +1144,8 @@
# Items in the status list are all at rev 1, except the two things
# we changed...but then, they don't exist at all.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('iota', 'A/mu')
- expected_status.tweak(wc_rev=1)
svntest.actions.run_and_verify_commit (wc_dir,
expected_output,
@@ -1716,8 +1697,7 @@
'A/D/H/omega' : Item(verb='Sending'),
'A/C' : Item(verb='Sending'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D/H/omega', 'A/C', wc_rev=2, status=' ')
svntest.actions.run_and_verify_commit (wc_dir,
@@ -2008,8 +1988,7 @@
})
# Created expected status tree.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('iota', wc_rev=2)
# Commit the wc_dir and iota.
Index: subversion/tests/cmdline/copy_tests.py
===================================================================
--- subversion/tests/cmdline/copy_tests.py (revision 22145)
+++ subversion/tests/cmdline/copy_tests.py (working copy)
@@ -314,8 +314,7 @@
# Create expected status tree; all local revisions should be at 1,
# but several files should be at revision 2. Also, two files should
# be missing.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D/G/rho', 'A/mu', wc_rev=2)
expected_status.add({
@@ -388,8 +387,7 @@
})
# Create expected status tree.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'A/B/newG' : Item(status=' ', wc_rev=2),
'A/B/newG/pi' : Item(status=' ', wc_rev=2),
@@ -1950,8 +1948,7 @@
})
# Create expected status tree
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'A/D/rho_copy_1' : Item(status=' ', wc_rev=2),
'A/B/F/rho_copy_2' : Item(status=' ', wc_rev=2),
@@ -2012,8 +2009,7 @@
})
# Create expected status tree
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'A/B/F/rho_copy_moved' : Item(status=' ', wc_rev=2),
'A/D/G/E_copy_moved' : Item(status=' ', wc_rev=2),
@@ -2069,8 +2065,7 @@
})
# Create expected status tree
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'A/D/G/E_move_moved/' : Item(status=' ', wc_rev=2),
'A/D/G/E_move_moved/alpha' : Item(status=' ', wc_rev=2),
@@ -2128,8 +2123,7 @@
})
# Create expected status tree
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'A/B/F/D_moved' : Item(status=' ', wc_rev=2),
'A/B/F/D_moved/gamma' : Item(status=' ', wc_rev=2),
@@ -2199,8 +2193,7 @@
})
# Create expected status tree
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'A/B/F/D_moved' : Item(status=' ', wc_rev=2),
'A/B/F/D_moved/gamma' : Item(status=' ', wc_rev=2),
@@ -2270,8 +2263,7 @@
})
# Create expected status tree
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'A/B/F/D_moved' : Item(status=' ', wc_rev=2),
'A/B/F/D_moved/gamma' : Item(status=' ', wc_rev=2),
@@ -2340,8 +2332,7 @@
})
# Create expected status tree
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'A/B/F/D_moved' : Item(status=' ', wc_rev=2),
'A/B/F/D_moved/gamma' : Item(status=' ', wc_rev=2),
@@ -2398,8 +2389,7 @@
})
# Create expected status tree
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'A/D/G/rho' : Item(status=' ', wc_rev=2),
})
@@ -2537,8 +2527,7 @@
})
# Create expected status tree
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'A/D/H/I' : Item(status=' ', wc_rev=2),
'A/D/H/I/J' : Item(status=' ', wc_rev=2),
Index: subversion/tests/cmdline/diff_tests.py
===================================================================
--- subversion/tests/cmdline/diff_tests.py (revision 22145)
+++ subversion/tests/cmdline/diff_tests.py (working copy)
@@ -717,8 +717,7 @@
})
# Create expected status tree
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'A/theta' : Item(status=' ', wc_rev=2),
})
@@ -782,8 +781,7 @@
'A/theta' : Item(verb='Sending'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
- expected_status.tweak(wc_rev=2)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.add({
'A/theta' : Item(status=' ', wc_rev=3),
})
@@ -868,8 +866,7 @@
'iota' : Item(verb='Sending'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('iota', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
@@ -1012,8 +1009,7 @@
'A/mu' : Item(verb='Deleting'),
'A/D/newfile' : Item(verb='Adding')
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
- expected_status.tweak(wc_rev=2)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak('iota', wc_rev=3)
expected_status.remove('A/mu')
expected_status.add({
@@ -1085,8 +1081,7 @@
expected_output = svntest.wc.State(wc_dir, {
'A/mu' : Item(verb='Sending'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
@@ -1106,8 +1101,7 @@
expected_output = svntest.wc.State(wc_dir, {
'A' : Item(verb='Deleting'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
- expected_status.tweak(wc_rev=2)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.remove('A', 'A/B', 'A/B/E', 'A/B/E/beta', 'A/B/E/alpha',
'A/B/F', 'A/B/lambda', 'A/D', 'A/D/G', 'A/D/G/rho',
'A/D/G/pi', 'A/D/G/tau', 'A/D/H', 'A/D/H/psi',
@@ -1747,8 +1741,7 @@
})
# Create expected status tree
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'iota' : Item(status=' ', wc_rev=2),
})
@@ -1766,8 +1759,7 @@
'iota' : Item(verb='Sending'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'iota' : Item(status=' ', wc_rev=3),
})
Index: subversion/tests/cmdline/export_tests.py
===================================================================
--- subversion/tests/cmdline/export_tests.py (revision 22145)
+++ subversion/tests/cmdline/export_tests.py (working copy)
@@ -353,8 +353,7 @@
expected_output = svntest.wc.State(wc_dir, {
'A/B/E/alpha' : Item(verb='Deleting'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/B/E/alpha')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, expected_status,
Index: subversion/tests/cmdline/history_tests.py
===================================================================
--- subversion/tests/cmdline/history_tests.py (revision 22145)
+++ subversion/tests/cmdline/history_tests.py (working copy)
@@ -51,8 +51,7 @@
'A/D/G/rho' : Item(verb='Deleting'),
'A/D/G/bloo' : Item(verb='Adding')
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/D/G/rho');
expected_status.add({ 'A/D/G/bloo' :
Item(wc_rev=2, status=' ') })
@@ -77,8 +76,7 @@
'A/D/G/pi' : Item(verb='Deleting'),
'A/D/G/rho' : Item(verb='Adding')
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/D/G/pi');
expected_status.tweak('A/D/G/rho', wc_rev=3)
expected_status.add({ 'A/D/G/bloo' :
Index: subversion/tests/cmdline/lock_tests.py
===================================================================
--- subversion/tests/cmdline/lock_tests.py (revision 22145)
+++ subversion/tests/cmdline/lock_tests.py (working copy)
@@ -127,8 +127,7 @@
svntest.main.file_append(file_path, "Tweak!\n")
svntest.main.run_svn(None, 'commit', '-m', '', '--no-unlock', file_path)
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak(fname, wc_rev=2)
expected_status.tweak(fname, writelocked='K')
@@ -154,8 +153,7 @@
svntest.main.file_append(file_path, "Tweak!\n")
svntest.main.run_svn(None, 'commit', '-m', '', file_path)
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak(fname, wc_rev=2)
# Make sure the file is unlocked
@@ -181,8 +179,7 @@
svntest.main.run_svn(None, 'propset', 'blue', 'azul', file_path)
svntest.main.run_svn(None, 'commit', '-m', '', file_path)
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak(fname, wc_rev=2)
# Make sure the file is unlocked
@@ -616,8 +613,7 @@
'--password', svntest.main.wc_passwd,
'-m', '', file_path)
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak(fname, wc_rev=2)
expected_status.tweak(fname, writelocked='K')
@@ -666,8 +662,7 @@
'--password', svntest.main.wc_passwd,
'-m', '', file_path)
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak(fname, wc_rev=2)
expected_status.tweak(fname, writelocked='K')
@@ -712,8 +707,7 @@
'--password', svntest.main.wc_passwd,
'-m', '', file_path)
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak(fname, wc_rev=2)
expected_status.tweak(fname, writelocked='K')
@@ -813,8 +807,7 @@
raise svntest.Failure
# verify status is as we expect
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('iota', wc_rev=2)
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -1195,8 +1188,7 @@
svntest.main.file_append(file_path, "Followup data.\n")
svntest.main.run_svn(None, 'commit', '-m', '', file_path)
- expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({ fname : Item(status=' ', wc_rev=3), })
# Make sure the file is unlocked
Index: subversion/tests/cmdline/revert_tests.py
===================================================================
--- subversion/tests/cmdline/revert_tests.py (revision 22145)
+++ subversion/tests/cmdline/revert_tests.py (working copy)
@@ -303,8 +303,7 @@
'file1' : Item(verb='Adding')
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'file1' : Item(status=' ', wc_rev=2),
})
Index: subversion/tests/cmdline/special_tests.py
===================================================================
--- subversion/tests/cmdline/special_tests.py (revision 22145)
+++ subversion/tests/cmdline/special_tests.py (working copy)
@@ -66,8 +66,7 @@
raise svntest.Failure
# Commit and make sure everything is good
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'newfile' : Item(status=' ', wc_rev=2),
'linktarget' : Item(status=' ', wc_rev=2),
@@ -110,8 +109,7 @@
'newfile' : Item(verb='Sending'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
- expected_status.tweak(wc_rev=2)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.add({
'newfile' : Item(status=' ', wc_rev=3),
'linktarget' : Item(status=' ', wc_rev=2),
@@ -227,8 +225,7 @@
'A/D/H/linktarget' : Item(verb='Adding'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'A/D/H/newfile' : Item(status=' ', wc_rev=2),
'A/D/H/linktarget' : Item(status=' ', wc_rev=2),
@@ -272,8 +269,7 @@
'linktarget' : Item(verb='Adding'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'newfile' : Item(status=' ', wc_rev=2),
'linktarget' : Item(status=' ', wc_rev=2),
@@ -325,8 +321,7 @@
'linktarget' : Item(verb='Adding'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'newfile' : Item(status=' ', wc_rev=2),
'linktarget' : Item(status=' ', wc_rev=2),
@@ -344,8 +339,7 @@
'newfile' : Item(verb='Deleting'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'linktarget' : Item(status=' ', wc_rev=2),
})
Index: subversion/tests/cmdline/stat_tests.py
===================================================================
--- subversion/tests/cmdline/stat_tests.py (revision 22145)
+++ subversion/tests/cmdline/stat_tests.py (working copy)
@@ -86,8 +86,7 @@
# Create expected status tree; all local revisions should be at 1,
# but newdir and newfile should be at revision 2.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'newdir' : Item(status=' ', wc_rev=2),
'newdir/newfile' : Item(status=' ', wc_rev=2),
@@ -104,8 +103,7 @@
# Create expected status tree; all local revisions should be at 1,
# but newdir and newfile should be present with 'blank' attributes.
- expected_status = svntest.actions.get_virginal_state(wc_backup, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_backup, 1)
# Verify status. Notice that we're running status *without* the
# --quiet flag, so the unversioned items will appear.
Index: subversion/tests/cmdline/svnlook_tests.py
===================================================================
--- subversion/tests/cmdline/svnlook_tests.py (revision 22145)
+++ subversion/tests/cmdline/svnlook_tests.py (working copy)
@@ -72,8 +72,7 @@
# Create expected status tree; all local revisions should be at 1,
# but mu and rho should be at revision 2.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', 'A/D/G/rho', wc_rev=2)
svntest.actions.run_and_verify_commit (wc_dir,
@@ -189,8 +188,7 @@
'A/B/E2' : Item(verb='Adding'),
'A/B/E2/alpha' : Item(verb='Deleting'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/B/E', 'A/B/E/alpha', 'A/B/E/beta')
expected_status.add({
'A/B/E2' : Item(status=' ', wc_rev=2),
Index: subversion/tests/cmdline/svnversion_tests.py
===================================================================
--- subversion/tests/cmdline/svnversion_tests.py (revision 22145)
+++ subversion/tests/cmdline/svnversion_tests.py (working copy)
@@ -56,8 +56,7 @@
[ "1M\n" ], [])
expected_output = wc.State(wc_dir, {'A/mu' : Item(verb='Sending')})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=2)
if svntest.actions.run_and_verify_commit (wc_dir,
expected_output, expected_status,
Index: subversion/tests/cmdline/switch_tests.py
===================================================================
--- subversion/tests/cmdline/switch_tests.py (revision 22145)
+++ subversion/tests/cmdline/switch_tests.py (working copy)
@@ -521,8 +521,7 @@
# Delete A/mu to create a deleted entry for mu in A/.svn/entries
mu_path = os.path.join(wc_dir, 'A', 'mu')
svntest.actions.run_and_verify_svn(None, None, [], 'rm', mu_path)
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/mu')
expected_output = svntest.wc.State(wc_dir, {
'A/mu' : Item(verb='Deleting'),
@@ -760,8 +759,7 @@
# which changes are received, but since the new psi is a dir, it
# appears we can count on it being received last. But if this test
# ever starts failing, you read it here first :-).
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D/H', status='! ', switched='S', wc_rev=2)
expected_status.remove('A/D/H/psi', 'A/D/H/chi', 'A/D/H/omega')
expected_status.add({
@@ -853,8 +851,7 @@
E_path = os.path.join(wc_dir, 'A', 'B', 'E')
alpha_path = os.path.join(E_path, 'alpha')
svntest.actions.run_and_verify_svn(None, None, [], 'rm', alpha_path)
- expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/B/E/alpha')
expected_output = svntest.wc.State(wc_dir, {
'A/B/E/alpha' : Item(verb='Deleting'),
@@ -1005,8 +1002,7 @@
expected_output = svntest.wc.State(wc_dir, {
'A/mu' : Item(verb='Sending'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=3)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, expected_status,
@@ -1115,8 +1111,7 @@
})
# After committing, status should show no sign of gamma.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/D/gamma')
# Commit the deletion of gamma and verify.
Index: subversion/tests/cmdline/trans_tests.py
===================================================================
--- subversion/tests/cmdline/trans_tests.py (revision 22145)
+++ subversion/tests/cmdline/trans_tests.py (working copy)
@@ -423,8 +423,7 @@
'A/D/G/rho' : Item(verb='Sending'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
# rho has props
expected_status.tweak('A/D/G/rho', wc_rev=2, status=' ')
@@ -441,8 +440,7 @@
f.close()
# Commit revision 3
- expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D/G/rho', wc_rev=3, status=' ')
svntest.actions.run_and_verify_commit (wc_dir,
@@ -614,8 +612,7 @@
expected_output = wc.State(wc_dir, {
'A/mu' : Item(verb='Sending'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit (wc_dir,
expected_output, expected_status,
@@ -704,8 +701,7 @@
expected_output = wc.State(wc_dir, {
'A/mu' : Item(verb='Sending'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, expected_status,
@@ -718,8 +714,7 @@
expected_output = wc.State(wc_dir, {
'A/mu' : Item(verb='Sending'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=3)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, expected_status,
Index: subversion/tests/cmdline/update_tests.py
===================================================================
--- subversion/tests/cmdline/update_tests.py (revision 22145)
+++ subversion/tests/cmdline/update_tests.py (working copy)
@@ -98,8 +98,7 @@
})
# Create expected status tree
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'A/theta' : Item(status=' ', wc_rev=2),
})
@@ -124,8 +123,7 @@
})
# Create expected status tree
- expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'A/theta' : Item(status=' ', wc_rev=3),
})
@@ -229,8 +227,7 @@
})
# Create expected status tree
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'A/theta' : Item(status=' ', wc_rev=2),
'A/zeta' : Item(status=' ', wc_rev=2),
@@ -254,8 +251,7 @@
})
# Create expected status tree
- expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'A/theta' : Item(status=' ', wc_rev=3),
'A/zeta' : Item(status=' ', wc_rev=3),
@@ -283,8 +279,7 @@
})
# Create expected status tree for the update.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
- expected_status.tweak(wc_rev=2)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.add({
'A/theta' : Item(status=' ', wc_rev=2),
'A/zeta' : Item(status=' ', wc_rev=2),
@@ -476,8 +471,7 @@
})
# Create expected status tree
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('iota', wc_rev=2)
# Commit the change, creating revision 2.
@@ -540,8 +534,7 @@
# Create expected status tree; all local revisions should be at 1,
# but mu and rho should be at revision 2.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=2)
expected_status.tweak('A/D/G/rho', wc_rev=2, status=' ')
@@ -707,8 +700,7 @@
'A/B/E/alpha' : Item(verb='Deleting'),
'A/B/F' : Item(verb='Deleting'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/B/E/alpha')
expected_status.remove('A/B/F')
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
@@ -829,8 +821,7 @@
expected_output = svntest.wc.State(wc_dir, {
'A/B/F' : Item(verb='Deleting'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/B/F')
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status, None,
@@ -843,8 +834,7 @@
expected_output = svntest.wc.State(wc_dir, {
'A/B/F' : Item(verb='Adding'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/B/F', wc_rev=3)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status, None,
@@ -897,8 +887,7 @@
expected_output = svntest.wc.State(wc_dir, {
'A/mu' : Item(verb='Sending'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status, None,
@@ -941,8 +930,7 @@
})
# Create expected status tree
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('iota', wc_rev=2)
# Commit the change, creating revision 2.
@@ -1044,10 +1032,9 @@
expected_disk.remove('A/D/H', 'A/D/H/chi', 'A/D/H/omega', 'A/D/H/psi')
# Create expected status tree for the update.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/B/E', 'A/B/E/alpha', 'A/B/E/beta')
expected_status.remove('A/D/H', 'A/D/H/chi', 'A/D/H/omega', 'A/D/H/psi')
- expected_status.tweak(wc_rev=1)
# Do the update, specifying the deleted paths explicitly.
svntest.actions.run_and_verify_update(wc_dir,
@@ -1091,8 +1078,7 @@
expected_output = svntest.wc.State(wc_dir, {
'A/D/gamma' : Item(verb='Deleting'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/D/gamma')
svntest.actions.run_and_verify_commit (wc_dir,
expected_output,
@@ -1148,8 +1134,7 @@
'A/D/gamma' : Item(verb='Deleting'),
'A/B/F' : Item(verb='Deleting'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/D/gamma', 'A/B/F')
svntest.actions.run_and_verify_commit (wc_dir,
expected_output,
@@ -1169,9 +1154,8 @@
'A/D/gamma' : Item(status='A '),
'A/B/F' : Item(status='A '),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_disk = svntest.main.greek_state.copy()
- expected_status.tweak(wc_rev=1)
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
expected_disk,
@@ -1231,8 +1215,7 @@
'A/mu' : Item(verb='Sending'),
'A/D/G/rho' : Item(verb='Sending'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', 'A/D/G/rho', wc_rev=2)
svntest.actions.run_and_verify_commit (wc_dir, expected_output,
expected_status,
@@ -1504,8 +1487,7 @@
expected_output = svntest.wc.State(wc_dir, {
'A/B/E/alpha' : Item(verb='Deleting'),
})
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/B/E/alpha')
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status, None,
@@ -1595,8 +1577,7 @@
# Create expected status tree; all local revisions should be at 1,
# but 'foo & bar' should be at revision 2.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
' foo & bar' : Item(status=' ', wc_rev=2),
})
@@ -1933,8 +1914,7 @@
})
# Create expected status tree.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'A/B/F/nu' : Item(status=' ', wc_rev=2),
'kappa' : Item(status=' ', wc_rev=2),
@@ -2054,8 +2034,7 @@
})
# Create expected status tree.
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak(wc_rev=1)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'A/B/F/nu' : Item(status=' ', wc_rev=2),
'A/C/I' : Item(status=' ', wc_rev=2),
@@ -2237,7 +2216,6 @@
'dir1/file1' : Item(status='A '),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
- expected_status.tweak(wc_rev=3)
expected_status.add({
'dir1' : Item(status=' ', wc_rev=3),
'dir1/file1' : Item(status=' ', wc_rev=3),
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 28 18:53:38 2006