Jay Freeman (saurik) wrote:
>Branko:
>
>OK, here is the new version.
>
Jay, thanks, I applied this (with the changes I suggested), it's in
revision 1244.
Test show that there's still some work to be done. Problems seem to be
in the post-commit log replay. Care to look into that?
(I attached a partial log of the test run. Ignore the target-test
errors, those are a problem in the script. svn-test.sh and svn-test2.sh
are the interesting bits.)
--
Brane Čibej <brane_at_xbc.nu> http://www.xbc.nu/brane/
START: path-test
PASS: path-test.exe 1: test svn_path_is_child
PASS: path-test.exe 2: test svn_path_split
PASS: path-test.exe 3: test svn_path_is_url
PASS: path-test.exe 4: test svn_path_uri_[en/de]code
END: path-test
START: random-test
SEED: random delta test, seed = 3099133817
PASS: random-test.exe 1: random delta test, seed = 3099133817
END: random-test
START: hashdump-test
PASS: hashdump-test.exe 1: write a hash to a file
PASS: hashdump-test.exe 2: read a file into a hash
PASS: hashdump-test.exe 3: write hash out, read back in, compare
END: hashdump-test
START: stringtest
PASS: stringtest.exe 1: make svn_stringbuf_t from cstring
PASS: stringtest.exe 2: make svn_stringbuf_t from substring of cstring
PASS: stringtest.exe 3: append svn_stringbuf_t to svn_stringbuf_t
PASS: stringtest.exe 4: append C string to svn_stringbuf_t
PASS: stringtest.exe 5: append bytes, then compare two strings
PASS: stringtest.exe 6: dup two strings, then compare
PASS: stringtest.exe 7: chopping a string
PASS: stringtest.exe 8: emptying a string
PASS: stringtest.exe 9: fill string with hashmarks
PASS: stringtest.exe 10: chop_back_to_char
PASS: stringtest.exe 11: block initialization and growth
PASS: stringtest.exe 12: formatting strings from varargs
PASS: stringtest.exe 13: create string from file
END: stringtest
START: translate-test
PASS: translate-test.exe 1: no conversions
PASS: translate-test.exe 2: convert CRLF to CRLF
PASS: translate-test.exe 3: convert LF to CRLF
PASS: translate-test.exe 4: convert CR to CRLF
PASS: translate-test.exe 5: convert mixed line endings to CRLF
PASS: translate-test.exe 6: convert LF to LF
PASS: translate-test.exe 7: convert CRLF to LF
PASS: translate-test.exe 8: convert CR to LF
PASS: translate-test.exe 9: convert mixed line endings to LF
PASS: translate-test.exe 10: convert CRLF to CR
PASS: translate-test.exe 11: convert LF to CR
PASS: translate-test.exe 12: convert CR to CR
PASS: translate-test.exe 13: convert mixed line endings to CR
PASS: translate-test.exe 14: don't convert mixed line endings in absence of repair flag
PASS: translate-test.exe 15: expand author keyword
PASS: translate-test.exe 16: expand date keyword
PASS: translate-test.exe 17: expand author and date keywords
PASS: translate-test.exe 18: expand author and rev keywords
PASS: translate-test.exe 19: expand rev keyword
PASS: translate-test.exe 20: expand rev and url keywords
PASS: translate-test.exe 21: expand author, date, rev, and url keywords
PASS: translate-test.exe 22: lf_to_crlf, plus expand author keyword
PASS: translate-test.exe 23: mixed_to_lf, plus expand author and date keywords
PASS: translate-test.exe 24: crlf_to_cr, plus expand author and rev keywords
PASS: translate-test.exe 25: cr_to_crlf, plus expand rev keyword
PASS: translate-test.exe 26: cr_to_crlf, plus expand rev and url keywords
PASS: translate-test.exe 27: mixed_to_crlf, plus expand author, date, rev, and url keywords
PASS: translate-test.exe 28: unexpand author keyword
PASS: translate-test.exe 29: unexpand date keyword
PASS: translate-test.exe 30: unexpand author and date keywords
PASS: translate-test.exe 31: unexpand author and rev keywords
PASS: translate-test.exe 32: unexpand rev keyword
PASS: translate-test.exe 33: unexpand rev and url keywords
PASS: translate-test.exe 34: unexpand author, date, rev, and url keywords
PASS: translate-test.exe 35: lf_to_crlf, plus unexpand author keyword
PASS: translate-test.exe 36: mixed_to_lf, plus unexpand author and date keywords
PASS: translate-test.exe 37: crlf_to_cr, plus unexpand author and rev keywords
PASS: translate-test.exe 38: cr_to_crlf, plus unexpand rev keyword
PASS: translate-test.exe 39: cr_to_crlf, plus unexpand rev and url keywords
PASS: translate-test.exe 40: mixed_to_crlf, plus unexpand author, date, rev, and url keywords
END: translate-test
START: svn-test.sh
Checking out t1.
Modifying t1/A/D/G/pi.
END: svn-test.sh
START: svn-test2.sh
Checking out t1.
A t1/iota
A t1/A
A t1/A/mu
A t1/A/B
A t1/A/B/lambda
A t1/A/B/E
A t1/A/B/E/alpha
A t1/A/B/E/beta
A t1/A/B/F
A t1/A/C
A t1/A/D
A t1/A/D/gamma
A t1/A/D/G
A t1/A/D/G/pi
A t1/A/D/G/rho
A t1/A/D/G/tau
A t1/A/D/H
A t1/A/D/H/chi
A t1/A/D/H/psi
A t1/A/D/H/omega
Updating t1/iota with properties. (up2.xml)
_U ./iota
Updating t1/A/ with properties. (up5.xml)
_U ./A
Properties on t1/A:
Properties on 't1/A':
ninja : hamster
wings : airplane
Properties on t1/iota:
Properties on 't1/iota':
ocean : atlantic
bat : ball
color : blue
Making local changes to these properties.
property `ninja' set on 't1/A'
property `wings' set on 't1/A'
property `window' set on 't1/A'
property `door' set on 't1/A'
property `bat' set on 't1/iota'
property `lexicon' set on 't1/iota'
property `yowza' set on 't1/A'
Making local text changes on pi and rho.
Status of directory:
_M t1/A
M t1/A/D/G/pi
M t1/A/D/G/rho
_M t1/iota
Updating with (conflicting) properties. (up-props.xml)
Updating with (conflicting) text. (pipatch.xml)
Status of directory:
_M t1/A
M t1/A/D/G/pi
M t1/A/D/G/rho
_M t1/iota
Attempting to commit while conflicts are present:
apr_error: #22502, src_err 0 : <The system cannot find the file specified. >
commit failed (see below), and commit cleanup failed:
apr_error: #22502, src_err 0 : <The system cannot find the file specified. >
remove_all_locks: couldn't unlock c:/Home/brane/src/svn/repo/subversion/tests/clients/cmdline/xmltests/t1/A/.svn/lock
apr_error: #22502, src_err 0 : <The system cannot find the file specified. >
failed to set file 'c:/Home/brane/src/svn/repo/subversion/tests/clients/cmdline/xmltests/t1/A/.svn/lock' read-write
svn_error: #21033 : <Attempted to lock an already-locked dir>
---- commit error follows:
svn_error: #21033 : <Attempted to lock an already-locked dir>
commit failed: while sending tree-delta to repos.
svn_error: #21033 : <Attempted to lock an already-locked dir>
working copy locked: c:/Home/brane/src/svn/repo/subversion/tests/clients/cmdline/xmltests/t1/A/D/G
Removing all .prej files...
Attempting to commit while conflicts are present:
apr_error: #22502, src_err 0 : <The system cannot find the file specified. >
commit failed (see below), and commit cleanup failed:
apr_error: #22502, src_err 0 : <The system cannot find the file specified. >
remove_all_locks: couldn't unlock c:/Home/brane/src/svn/repo/subversion/tests/clients/cmdline/xmltests/t1/A/.svn/lock
apr_error: #22502, src_err 0 : <The system cannot find the file specified. >
failed to set file 'c:/Home/brane/src/svn/repo/subversion/tests/clients/cmdline/xmltests/t1/A/.svn/lock' read-write
svn_error: #21033 : <Attempted to lock an already-locked dir>
---- commit error follows:
svn_error: #21033 : <Attempted to lock an already-locked dir>
commit failed: while sending tree-delta to repos.
svn_error: #21033 : <Attempted to lock an already-locked dir>
working copy locked: c:/Home/brane/src/svn/repo/subversion/tests/clients/cmdline/xmltests/t1/A/D/G
Remove all .rej files...
Status of directory:
_M t1/A
M t1/A/D/G/pi
M t1/A/D/G/rho
_M t1/iota
Attempting to commit again, with conflicts removed.
Status of directory:
_M t1/A
M t1/A/D/G/pi
M t1/A/D/G/rho
_M t1/iota
END: svn-test2.sh
START: target-test.sh
FAIL: target-test 1: normal use
FAIL: target-test 2: identical dirs
FAIL: target-test 3: identical files
FAIL: target-test 4: single dir
FAIL: target-test 5: single file
END: target-test.sh
START: run-fs-tests.sh
- running all sub-tests in key-test ...
PASS: key-test.exe 1: testing sequential alphanumeric key generation
- running all sub-tests in skel-test ...
PASS: skel-test.exe 1: parse implicit-length atoms
PASS: skel-test.exe 2: parse explicit-length atoms
PASS: skel-test.exe 3: parse invalid atoms
PASS: skel-test.exe 4: parse lists
PASS: skel-test.exe 5: unparse implicit-length atoms
PASS: skel-test.exe 6: unparse lists
- running all sub-tests in strings-reps-test ...
PASS: strings-reps-test.exe 1: Write a new rep, get a new key back.
PASS: strings-reps-test.exe 2: Write a new rep, then overwrite it.
PASS: strings-reps-test.exe 3: Write and overwrite a new rep; confirm with reads.
PASS: strings-reps-test.exe 4: Write, then delete, a new rep; confirm deletion.
PASS: strings-reps-test.exe 5: Test many strings table functions together.
PASS: strings-reps-test.exe 6: Write a null string.
PASS: strings-reps-test.exe 7: Write a string, then abort during an overwrite.
PASS: strings-reps-test.exe 8: Create and copy a string
- running all sub-tests in fs-test ...
PASS: fs-test.exe 1: svn_fs_create_berkeley
PASS: fs-test.exe 2: open an existing Berkeley DB filesystem
PASS: fs-test.exe 3: begin a txn, check its name, then close it
PASS: fs-test.exe 4: open an existing transaction by name
PASS: fs-test.exe 5: begin a txn, get the txn root, and add a file
PASS: fs-test.exe 6: create 2 txns, list them, and verify the list.
PASS: fs-test.exe 7: call functions with unopened filesystem and check errors
PASS: fs-test.exe 8: write and read a file's contents
PASS: fs-test.exe 9: make a file, a subdir, and another file in that subdir
PASS: fs-test.exe 10: make The Official Subversion Test Tree
PASS: fs-test.exe 11: fill a directory, then list it
PASS: fs-test.exe 12: set and get some revision properties
PASS: fs-test.exe 13: set/get txn props, commit, validate new rev props
PASS: fs-test.exe 14: set and get some node properties
END: run-fs-tests.sh
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:06 2006