Hi All,
Find the attached patch and log.
With regards
Kamesh Jayachandran
[[[
Code simplification.
* subversion/tests/cmdline/merge_tests.py
(textual_merges_galore):
Why to get the 'expected_status' tree with all 'wc_rev' set to 2 and
changing it all back to 1. Better get it with '1' in one shot.
Patch by: Kamesh Jayachandran <kamesh@collab.net>
]]]
Index: subversion/tests/cmdline/merge_tests.py
===================================================================
--- subversion/tests/cmdline/merge_tests.py (revision 22136)
+++ subversion/tests/cmdline/merge_tests.py (working copy)
@@ -128,8 +128,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.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Oct 27 15:24:03 2006