>> > * excepting "merge_tests.py 63: merge fails if subtree is
>> deleted on
>> > src", which has been failing since r26803.
>>
>Kamesh - the Win32 buildbots have the details:
>http://www.mobsol.be/buildbot/win32-xp%20VS2005/builds/2379/step-Test%20fsfs%2Bra_local/0
>Paul
Paul,
Some thoughts on this failure.
Something needs to be done in our testsuite to fix this.
expected_merge_output does atleast one match with the regex
* In linux we did not catch this as actual merge output
'D svn-test-work/working_copies/merge_tests-63/A_copy/D/gamma' did match the regex while the merge notification did not match due to r26803.
* In windows somehow
'D svn-test-work\working_copies\merge_tests-63\A_copy\D\gamma' did not match with the regex.
You may ask how does it work with other 'expected_merge_output',
Almost in all the use of 'expected_merge_output' it happened to be for 'single file merging' which still uses a old style. In other few cases where we use 'expected_merge_output' we do use it for short revision range which does merge range for same revs as the old style.
Quick fix would be to change the expectation as matching with the new style, like the following patch.
More proper fix would be to analyse and fix why the path does not match in win32 as it does in Linux. Still we may need the following patch as a matter of completeness.
Index: subversion/tests/cmdline/merge_tests.py
===================================================================
--- subversion/tests/cmdline/merge_tests.py (revision 26851)
+++ subversion/tests/cmdline/merge_tests.py (working copy)
@@ -7957,7 +7957,7 @@
A_url + '/D/gamma' + '@4',
Acopy_gamma_path)
- svntest.actions.run_and_verify_svn(None, expected_merge_output(3,
+ svntest.actions.run_and_verify_svn(None, expected_merge_output(2,
'D ' + Acopy_gamma_path + '\n', 5),
[], 'merge', '-r1:5', '--force',
A_url, Acopy_path)
Paul,
It would be great if you can help in above analysis on a win32 box.
With regards.
Kamesh Jayachandran
Received on Sat Sep 29 21:20:08 2007