Windows tests: FAIL: update_tests.py 38: update --accept automatic conflict resolution

I ran this AM and just getting a chance to report. Didn't see any
fixes since then. This is ra_local. Windows Buildbot seems to have
problems lately so did not want this to be missed.

CMD: svnadmin.exe create "svn-test-work\repositories\update_tests-38"
--bdb-txn-nosync "--fs-type=fsfs" <TIME = 1.719000>
CMD: svnadmin.exe dump "svn-test-work\local_tmp\repos" | svnadmin.exe
load "svn-test-work\repositories\update_tests-38" --ignore-uuid <TIME
= 0.031000>
CMD: svn.exe co --username jrandom --password rayjandom
file:///C:/svn/src-trunk/Release/subversion/tests/cmdline/svn-test-work/repositories/update_tests-38
"svn-test-work\working_copies\update_tests-38" --config-dir
"C:\svn\src-trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config"
<TIME = 1.453000>
CMD: svn.exe ci --username jrandom --password rayjandom -m "log msg"
"svn-test-work\working_copies\update_tests-38" --config-dir
"C:\svn\src-trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config"
<TIME = 1.250000>
CMD: svn.exe status -v -u -q --username jrandom --password rayjandom
"svn-test-work\working_copies\update_tests-38" --config-dir
"C:\svn\src-trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config"
<TIME = 0.203000>
CMD: svn.exe update
"svn-test-work\working_copies\update_tests-38.backup\iota"
--config-dir "C:\svn\src-trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config"
<TIME = 0.781000>
CMD: svn.exe update "--accept=postpone"
"svn-test-work\working_copies\update_tests-38.backup\A\B\lambda"
--config-dir "C:\svn\src-trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config"
<TIME = 1.000000>
CMD: svn.exe update "--accept=base"
"svn-test-work\working_copies\update_tests-38.backup\A\mu"
--config-dir "C:\svn\src-trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config"
<TIME = 1.000000>
CMD: svn.exe update "--accept=mine"
"svn-test-work\working_copies\update_tests-38.backup\A\B\E\alpha"
--config-dir "C:\svn\src-trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config"
<TIME = 1.000000>
CMD: svn.exe update "--accept=theirs"
"svn-test-work\working_copies\update_tests-38.backup\A\B\E\beta"
--config-dir "C:\svn\src-trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config"
<TIME = 1.016000>
CMD: svn.exe update "--accept=edit"
"svn-test-work\working_copies\update_tests-38.backup\A\D\G\pi"
--config-dir "C:\svn\src-trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config"
<TIME = 0.984000>
EXPECTED STDERR:
ACTUAL STDERR:
Traceback (most recent call last):
  File "C:\svn\src-trunk\subversion\tests\cmdline\svneditor.py", line
55, in <module>
    main()
  File "C:\svn\src-trunk\subversion\tests\cmdline\svneditor.py", line
31, in main
    f = open(filename)
IOError: [Errno 2] No such file or directory: "'tempfile.tmp'"
system('C:\svn\src-trunk\subversion\tests\cmdline\svneditor.py
'tempfile.tmp'') returned 1
EXCEPTION: SVNLineUnequal
Traceback (most recent call last):
  File "C:\svn\src-trunk\subversion\tests\cmdline\svntest\main.py",
line 925, in run
    rc = apply(self.pred.run, (), kw)
  File "C:\svn\src-trunk\subversion\tests\cmdline\svntest\testcase.py",
line 121, in run
    return self.func(sandbox)
  File "C:\svn\src-trunk\subversion/tests/cmdline/update_tests.py",
line 3385, in update_accept_conflicts
    pi_path_backup)
  File "C:\svn\src-trunk\subversion\tests\cmdline\svntest\actions.py",
line 159, in run_and_verify_svn
    verify.verify_outputs(message, out, err, expected_stdout, expected_stderr)
  File "C:\svn\src-trunk\subversion\tests\cmdline\svntest\verify.py",
line 294, in verify_outputs
    compare_and_display_lines(message, label, expected, actual, raisable)
  File "C:\svn\src-trunk\subversion\tests\cmdline\svntest\verify.py",
line 273, in compare_and_display_lines
    raise raisable
SVNLineUnequal
FAIL: update_tests.py 38: update --accept automatic conflict resolution
END: update_tests.py

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org