Hi All,
Find the attached patch and log.
With regards
Kamesh Jayachandram
[[[
Fix merge_tests 1 according to mergeinfo elision in working copies r23785.
* subversion/tests/cmdline/merge_tests.py
(textual_merges_galore):
merge of r2:3 on other_wc/A/D/G would not merge (thanks to WC mergeinfo
elision) as 'other_wc' has a mergeinfo '/:2-3'. Fix the test accordingly.
Patch by: kameshj
]]]
Index: subversion/tests/cmdline/merge_tests.py
===================================================================
--- subversion/tests/cmdline/merge_tests.py (revision 23788)
+++ subversion/tests/cmdline/merge_tests.py (working copy)
@@ -302,15 +302,6 @@
svntest.main.file_write(other_rho_path,
other_rho_text + current_other_rho_text)
- # We expect pi and tau to merge and conflict respectively, but
- # those are just side effects of the method we're using to test the
- # merge on rho, which is all we really care about.
- expected_output = wc.State(os.path.join(other_wc, 'A', 'D', 'G'),
- { 'rho' : Item(status='G '),
- 'pi' : Item(status='G '),
- 'tau' : Item(status='C '),
- })
-
expected_disk = wc.State("", {
'pi' : wc.StateItem("This is the file 'pi'.\n"),
'rho' : wc.StateItem("This is the file 'rho'.\n"),
@@ -318,8 +309,7 @@
})
expected_disk.tweak('rho', contents=other_rho_text
+ expected_disk.desc['rho'].contents
- + rho_text
- + additional_rho_text)
+ + rho_text)
expected_disk.tweak('pi',
contents=expected_disk.desc['pi'].contents
+ pi_text)
@@ -327,35 +317,29 @@
# Ouch, mom, I've got conflicts on my conflicts!
contents=expected_disk.desc['tau'].contents
+ "<<<<<<< .working\n"
- + "<<<<<<< .working\n"
+ other_tau_text
+ "=======\n"
+ tau_text
+ ">>>>>>> .merge-right.r3\n"
- + "=======\n"
- + tau_text
- + ">>>>>>> .merge-right.r3\n"
)
- expected_status = wc.State(os.path.join(other_wc, 'A', 'D', 'G'),
- { '' : Item(wc_rev=1, status=' M'),
- 'rho' : Item(wc_rev=2, status='G '),
- 'pi' : Item(wc_rev=1, status='G '),
- 'tau' : Item(wc_rev=1, status='C '),
- })
- expected_status.tweak('pi', status='M ')
- expected_status.tweak('rho', status='M ')
- expected_status.tweak('tau', status='C ')
+ other_wc_ADG = os.path.join(other_wc, 'A', 'D', 'G')
+ expected_output = wc.State(other_wc_ADG, { })
+ expected_status = wc.State(other_wc_ADG, {
+ '' : Item(status=' ', wc_rev=1),
+ 'pi' : Item(status='M ', wc_rev=1),
+ 'rho' : Item(status='M ', wc_rev=2),
+ 'tau' : Item(status='C ', wc_rev=1)
+ })
- svntest.actions.run_and_verify_merge(
- os.path.join(other_wc, 'A', 'D', 'G'),
- '2', '3',
- sbox.repo_url + '/A/D/G',
- expected_output,
- expected_disk,
- expected_status,
- expected_skip,
- None, merge_singleton_handler)
+ svntest.actions.run_and_verify_merge(other_wc_ADG,
+ '2', '3',
+ sbox.repo_url + '/A/D/G',
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ None, merge_singleton_handler)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Mar 13 15:11:14 2007