r21406 and Issue 2608 - [dav] x [bdb] test failure

Hi Dave,

Re r21406:

> Test for Issue #2608, which appears to be a failure to stop
> conflicting dirprop commits on the root of repository from being
> committed, under FSFS.
>
> * subversion/tests/cmdline/prop_tests.py
> (commit_conflict_dirprops): New test.
> (is_this_fsfs): New function, telling if the fs type is
> FSFS. (Assumes that FSFS is the default, ick.)
> (test_list): Add new test, XFailing under fsfs.

I'm seeing a failure on [dav] x [bdb] commit_conflict_dirprops test. Looks
like the regular expression you use in commit_conflict_dirprops() doesn't
account for the difference in error messages between file/svn and dav:

file://
-------
C:\SVN\svn.trunk\src-trunk.collabnet.trunk>Release\subversion\svn\svn.exe
"ci" "--username" "jrandom" "--password" "rayjandom" "-m" "log msg"
Release\subversion\tests\cmdline\svn-test-work\w
orking_copies\prop_tests-1
Sending
Release\subversion\tests\cmdline\svn-test-work\working_copies\prop_tests-1
svn: Commit failed (details follow):
svn: Out of date: '' in transaction '3'

Svnserve:
---------
C:\SVN\svn.trunk\src-trunk.collabnet.trunk>Release\subversion\svn\svn.exe
"ci" "--username" "jrandom" "--password" "rayjandom" "-m" "log msg"
Release\subversion\tests\cmdline\svn-test-work\w
orking_copies\prop_tests-1
Sending
Release\subversion\tests\cmdline\svn-test-work\working_copies\prop_tests-1
svn: Commit failed (details follow):
svn: Out of date: '' in transaction '3'

DAV:

----
C:\SVN\svn.trunk\src-trunk.collabnet.trunk>Release\subversion\svn\svn.exe 
"ci" "--username" "jrandom" "--password" "rayjandom" "-m" "log msg" 
Release\subversion\tests\cmdline\svn-test-work\w
orking_copies\prop_tests-1
Sending 
Release\subversion\tests\cmdline\svn-test-work\working_copies\prop_tests-1
svn: Commit failed (details follow):
svn: Your file or directory '.' is probably out-of-date
svn: The version resource does not correspond to the resource within the 
transaction.  Either the requested version resource is out of date (needs 
to be updated), or the requested version re
source is newer than the transaction root (restart the commit).
This should fix that:
Paul B.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org