Stefan Sperling <[email protected]> writes: > On Fri, Nov 09, 2012 at 11:07:33AM +0000, Philip Martin wrote: >> The Windows buildbots are failing on the 1.7.x branch: >> >> FAIL: patch_tests.py 37: patch target with no eol at eof >> >> @@ -1,2 +1,2 @@ >> -U svn-test-work\working_copies\patch_tests-37\A/mu >> +U svn-test-work\working_copies\patch_tests-37\A\mu >> U svn-test-work\working_copies\patch_tests-37\iota >> CWD: E:\w2k3\tests\subversion\tests\cmdline >> EXCEPTION: SVNLineUnequal >> >> The problem is the wrong separator in the path for the patch >> notification. >> >> This test is a PASS on trunk and I can't spot a difference in the test >> code so it appears to be a problem in the client. > > It's likely this bug in the test which I introduced on > the backport branch in r1399178. > > Can I just commit that to the 1.7.x branch as obvious fix? > > Index: subversion/tests/cmdline/patch_tests.py > =================================================================== > --- subversion/tests/cmdline/patch_tests.py (revision 1407431) > +++ subversion/tests/cmdline/patch_tests.py (working copy) > @@ -3939,7 +3939,7 @@ def patch_target_no_eol_at_eof(sbox): > "context", # no newline at end of file > ] > expected_output = [ > - 'U %s\n' % os.path.join(wc_dir, 'A/mu'), > + 'U %s\n' % os.path.join(wc_dir, 'A', 'mu'), > 'U %s\n' % os.path.join(wc_dir, 'iota'), > ]
The same code, without the above patch, seems to PASS on trunk. Why does the branch need different code? Does the testsuite have some path normalisation that corrects/hides the bug? If that patch is the correct solution I think you should commit to trunk and backport. -- Certified & Supported Apache Subversion Downloads: http://www.wandisco.com/subversion/download
