I just ran the tests (FSFS only) over all RA layers, using today's
head of Subversion (r34160) and Apache HTTPD 2.2.9. All layers
passed, except for ra_serf (also today's head, r1202), which had four
failing tests:
FAIL: commit_tests.py 28: commit deletion of out-of-date file or dir
FAIL: update_tests.py 47: tree conflicts on update 1.2
FAIL: switch_tests.py 32: tree conflicts on switch 1.2
FAIL: tree_conflict_tests.py 2: up/sw file: del/rpl/mv onto modify
Serf is still experimental, so AFAIK this doesn't have to hold up the
release. Here are details on the failures:
[...]
CMD: svnadmin create svn-test-work/repositories/commit_tests-28 --bdb-txn-nosync "--fs-type=fsfs" <TIME = 0.032805>
CMD: svnadmin dump "svn-test-work/local_tmp/repos" | svnadmin load "svn-test-work/repositories/commit_tests-28" --ignore-uuid <TIME = 0.010420>
CMD: svn co http://localhost/svn-test-work/repositories/commit_tests-28 svn-test-work/working_copies/commit_tests-28 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.290156>
A svn-test-work/working_copies/commit_tests-28/A
A svn-test-work/working_copies/commit_tests-28/A/B
A svn-test-work/working_copies/commit_tests-28/A/B/lambda
A svn-test-work/working_copies/commit_tests-28/A/B/E
A svn-test-work/working_copies/commit_tests-28/A/B/E/alpha
A svn-test-work/working_copies/commit_tests-28/A/B/E/beta
A svn-test-work/working_copies/commit_tests-28/A/mu
A svn-test-work/working_copies/commit_tests-28/A/D
A svn-test-work/working_copies/commit_tests-28/A/D/gamma
A svn-test-work/working_copies/commit_tests-28/A/D/G
A svn-test-work/working_copies/commit_tests-28/A/D/G/pi
A svn-test-work/working_copies/commit_tests-28/A/D/G/rho
A svn-test-work/working_copies/commit_tests-28/A/D/G/tau
A svn-test-work/working_copies/commit_tests-28/A/D/H
A svn-test-work/working_copies/commit_tests-28/A/D/H/chi
A svn-test-work/working_copies/commit_tests-28/A/D/H/omega
A svn-test-work/working_copies/commit_tests-28/A/D/H/psi
A svn-test-work/working_copies/commit_tests-28/iota
A svn-test-work/working_copies/commit_tests-28/A/C
A svn-test-work/working_copies/commit_tests-28/A/B/F
Checked out revision 1.
CMD: svn add svn-test-work/working_copies/commit_tests-28/A/I --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.036422>
A svn-test-work/working_copies/commit_tests-28/A/I
CMD: svn ci -m prep svn-test-work/working_copies/commit_tests-28 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.060868>
Adding svn-test-work/working_copies/commit_tests-28/A/I
Committed revision 2.
CMD: svn up svn-test-work/working_copies/commit_tests-28 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.043970>
At revision 2.
CMD: svn propset fooprop foopropval svn-test-work/working_copies/commit_tests-28/A/C --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.032358>
property 'fooprop' set on 'svn-test-work/working_copies/commit_tests-28/A/C'
CMD: svn propset fooprop foopropval svn-test-work/working_copies/commit_tests-28/A/B/E/alpha --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.032260>
property 'fooprop' set on 'svn-test-work/working_copies/commit_tests-28/A/B/E/alpha'
CMD: svn rm svn-test-work/working_copies/commit_tests-28/A/I svn-test-work/working_copies/commit_tests-28/A/B/F svn-test-work/working_copies/commit_tests-28/A/D/H/chi svn-test-work/working_copies/commit_tests-28/A/B/E/beta svn-test-work/working_copies/commit_tests-28/A/D/H/psi --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.039726>
D svn-test-work/working_copies/commit_tests-28/A/I
D svn-test-work/working_copies/commit_tests-28/A/B/F
D svn-test-work/working_copies/commit_tests-28/A/D/H/chi
D svn-test-work/working_copies/commit_tests-28/A/B/E/beta
D svn-test-work/working_copies/commit_tests-28/A/D/H/psi
CMD: svn ci -m "log msg" svn-test-work/working_copies/commit_tests-28 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.116968>
Sending svn-test-work/working_copies/commit_tests-28/A/B/E/alpha
Deleting svn-test-work/working_copies/commit_tests-28/A/B/E/beta
Deleting svn-test-work/working_copies/commit_tests-28/A/B/F
Sending svn-test-work/working_copies/commit_tests-28/A/C
Deleting svn-test-work/working_copies/commit_tests-28/A/D/H/chi
Sending svn-test-work/working_copies/commit_tests-28/A/D/H/omega
Deleting svn-test-work/working_copies/commit_tests-28/A/D/H/psi
Deleting svn-test-work/working_copies/commit_tests-28/A/I
Transmitting file data .
Committed revision 3.
CMD: svn status -v -u -q svn-test-work/working_copies/commit_tests-28 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.061217>
3 3 jrandom svn-test-work/working_copies/commit_tests-28/A/D/H/omega
2 1 jrandom svn-test-work/working_copies/commit_tests-28/A/D/H
2 1 jrandom svn-test-work/working_copies/commit_tests-28/A/D/G/pi
2 1 jrandom svn-test-work/working_copies/commit_tests-28/A/D/G/rho
2 1 jrandom svn-test-work/working_copies/commit_tests-28/A/D/G/tau
2 1 jrandom svn-test-work/working_copies/commit_tests-28/A/D/G
2 1 jrandom svn-test-work/working_copies/commit_tests-28/A/D/gamma
2 1 jrandom svn-test-work/working_copies/commit_tests-28/A/D
3 3 jrandom svn-test-work/working_copies/commit_tests-28/A/B/E/alpha
2 1 jrandom svn-test-work/working_copies/commit_tests-28/A/B/E
2 1 jrandom svn-test-work/working_copies/commit_tests-28/A/B/lambda
2 1 jrandom svn-test-work/working_copies/commit_tests-28/A/B
2 1 jrandom svn-test-work/working_copies/commit_tests-28/A/mu
3 3 jrandom svn-test-work/working_copies/commit_tests-28/A/C
2 2 jrandom svn-test-work/working_copies/commit_tests-28/A
2 1 jrandom svn-test-work/working_copies/commit_tests-28/iota
2 2 jrandom svn-test-work/working_copies/commit_tests-28
Status against revision: 3
CMD: svn propset fooprop foopropval svn-test-work/working_copies/commit_tests-28.backup/A/I --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.032705>
property 'fooprop' set on 'svn-test-work/working_copies/commit_tests-28.backup/A/I'
CMD: svn propset fooprop foopropval svn-test-work/working_copies/commit_tests-28.backup/A/B/E/beta --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.033669>
property 'fooprop' set on 'svn-test-work/working_copies/commit_tests-28.backup/A/B/E/beta'
CMD: svn rm svn-test-work/working_copies/commit_tests-28.backup/A/C svn-test-work/working_copies/commit_tests-28.backup/A/B/F svn-test-work/working_copies/commit_tests-28.backup/A/D/H/omega svn-test-work/working_copies/commit_tests-28.backup/A/B/E/alpha svn-test-work/working_copies/commit_tests-28.backup/A/D/H/psi --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.039722>
D svn-test-work/working_copies/commit_tests-28.backup/A/C
D svn-test-work/working_copies/commit_tests-28.backup/A/B/F
D svn-test-work/working_copies/commit_tests-28.backup/A/D/H/omega
D svn-test-work/working_copies/commit_tests-28.backup/A/B/E/alpha
D svn-test-work/working_copies/commit_tests-28.backup/A/D/H/psi
CMD: svn ci -m "log msg" svn-test-work/working_copies/commit_tests-28.backup/A/C --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom CMD: /home/kfogel/src/subversion/subversion/svn/svn ci -m "log msg" svn-test-work/working_copies/commit_tests-28.backup/A/C --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom exited with 1
<TIME = 0.057756>
Deleting svn-test-work/working_copies/commit_tests-28.backup/A/C
subversion/libsvn_client/commit.c:860: (apr_err=170004)
svn: Commit failed (details follow):
subversion/libsvn_ra_serf/util.c:718: (apr_err=170004)
svn: Item '/A/C' is out of date
CMD: svn ci -m "log msg" svn-test-work/working_copies/commit_tests-28.backup/A/I --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom CMD: /home/kfogel/src/subversion/subversion/svn/svn ci -m "log msg" svn-test-work/working_copies/commit_tests-28.backup/A/I --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom exited with 1
<TIME = 0.052428>
Sending svn-test-work/working_copies/commit_tests-28.backup/A/I
subversion/libsvn_client/commit.c:860: (apr_err=155011)
svn: Commit failed (details follow):
subversion/libsvn_client/commit_util.c:55: (apr_err=155011)
svn: Directory '' is out of date
subversion/libsvn_ra_serf/util.c:1563: (apr_err=160013)
svn: '' path not found
CMD: svn ci -m "log msg" svn-test-work/working_copies/commit_tests-28.backup/A/B/F --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom CMD: /home/kfogel/src/subversion/subversion/svn/svn ci -m "log msg" svn-test-work/working_copies/commit_tests-28.backup/A/B/F --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom exited with 1
<TIME = 0.053784>
Deleting svn-test-work/working_copies/commit_tests-28.backup/A/B/F
subversion/libsvn_client/commit.c:860: (apr_err=175002)
svn: Commit failed (details follow):
subversion/libsvn_ra_serf/commit.c:219: (apr_err=175002)
svn: DELETE of '/svn-test-work/repositories/commit_tests-28/!svn/wrk/0fc288ca-b104-11dd-9a8e-c3e9bef32d9b/A/B/F': 404 Not Found
EXPECTED STDERR (regexp):
.*(out of date)
ACTUAL STDERR:
subversion/libsvn_client/commit.c:860: (apr_err=175002)
svn: Commit failed (details follow):
subversion/libsvn_ra_serf/commit.c:219: (apr_err=175002)
svn: DELETE of '/svn-test-work/repositories/commit_tests-28/!svn/wrk/0fc288ca-b104-11dd-9a8e-c3e9bef32d9b/A/B/F': 404 Not Found
EXCEPTION: SVNUnmatchedError
Traceback (most recent call last):
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/main.py", line 1133, in run
rc = self.pred.run(**kw)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/testcase.py", line 121, in run
return self.func(sandbox)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/commit_tests.py", line 1701, in commit_out_of_date_deletions
commit(wc_backup, None, None, error_re, F_path)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/actions.py", line 1096, in run_and_verify_commit
verify.verify_outputs(None, None, errput, None, expected_err)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/verify.py", line 333, in verify_outputs
compare_and_display_lines(message, label, expected, actual, raisable)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/verify.py", line 305, in compare_and_display_lines
raise raisable
SVNUnmatchedError
FAIL: commit_tests.py 28: commit deletion of out-of-date file or dir
[...]
CMD: svnadmin create svn-test-work/repositories/update_tests-47 --bdb-txn-nosync "--fs-type=fsfs" <TIME = 0.031574>
CMD: svnadmin dump "svn-test-work/local_tmp/repos" | svnadmin load "svn-test-work/repositories/update_tests-47" --ignore-uuid <TIME = 0.005894>
CMD: svn co http://localhost/svn-test-work/repositories/update_tests-47 svn-test-work/working_copies/update_tests-47 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.233576>
A svn-test-work/working_copies/update_tests-47/A
A svn-test-work/working_copies/update_tests-47/A/B
A svn-test-work/working_copies/update_tests-47/A/B/lambda
A svn-test-work/working_copies/update_tests-47/A/B/E
A svn-test-work/working_copies/update_tests-47/A/B/E/alpha
A svn-test-work/working_copies/update_tests-47/A/B/E/beta
A svn-test-work/working_copies/update_tests-47/A/mu
A svn-test-work/working_copies/update_tests-47/A/D
A svn-test-work/working_copies/update_tests-47/A/D/gamma
A svn-test-work/working_copies/update_tests-47/A/D/G
A svn-test-work/working_copies/update_tests-47/A/D/G/pi
A svn-test-work/working_copies/update_tests-47/A/D/G/rho
A svn-test-work/working_copies/update_tests-47/A/D/G/tau
A svn-test-work/working_copies/update_tests-47/A/D/H
A svn-test-work/working_copies/update_tests-47/A/D/H/chi
A svn-test-work/working_copies/update_tests-47/A/D/H/omega
A svn-test-work/working_copies/update_tests-47/A/D/H/psi
A svn-test-work/working_copies/update_tests-47/iota
A svn-test-work/working_copies/update_tests-47/A/C
A svn-test-work/working_copies/update_tests-47/A/B/F
Checked out revision 1.
CMD: svn add svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.042830>
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDD
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDD/D1
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDD/D1/D2
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDD/D1/D2/D3
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDF
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDF/D1
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDF/D1/D2
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDF/D1/D2/gamma
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DD
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DD/D1
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DD/D1/D2
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DF
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DF/D1
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DF/D1/beta
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/D
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/D/D1
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/F
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/F/alpha
CMD: svn commit -m "initial state" svn-test-work/working_copies/update_tests-47 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.161603>
Adding svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del
Adding svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/D
Adding svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/D/D1
Adding svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DD
Adding svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DD/D1
Adding svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DD/D1/D2
Adding svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDD
Adding svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDD/D1
Adding svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDD/D1/D2
Adding svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDD/D1/D2/D3
Adding svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDF
Adding svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDF/D1
Adding svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDF/D1/D2
Adding svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDF/D1/D2/gamma
Adding svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DF
Adding svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DF/D1
Adding svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DF/D1/beta
Adding svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/F
Adding svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/F/alpha
Transmitting file data ...
Committed revision 2.
CMD: svn rm svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/F/alpha svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/D/D1 svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DF/D1/beta svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DD/D1/D2 svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDF/D1/D2/gamma svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDD/D1/D2/D3 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.042134>
D svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/F/alpha
D svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/D/D1
D svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DF/D1/beta
D svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DD/D1/D2
D svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDF/D1/D2/gamma
D svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDD/D1/D2/D3
CMD: svn commit -m "incoming changes" svn-test-work/working_copies/update_tests-47 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.109299>
Deleting svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/D/D1
Deleting svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DD/D1/D2
Deleting svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDD/D1/D2/D3
Deleting svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDF/D1/D2/gamma
Deleting svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DF/D1/beta
Deleting svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/F/alpha
Committed revision 3.
CMD: svn update -r2 svn-test-work/working_copies/update_tests-47 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.126689>
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/F/alpha
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DF/D1/beta
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDF/D1/D2/gamma
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDD/D1/D2/D3
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DD/D1/D2
A svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/D/D1
Updated to revision 2.
CMD: svn rm svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/F/alpha svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/D/D1 svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DF/D1 svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DD/D1 svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDF/D1 svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDD/D1 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.039804>
D svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/F/alpha
D svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/D/D1
D svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DF/D1/beta
D svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DF/D1
D svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DD/D1/D2
D svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DD/D1
D svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDF/D1/D2/gamma
D svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDF/D1/D2
D svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDF/D1
D svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDD/D1/D2/D3
D svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDD/D1/D2
D svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DDD/D1
CMD: svn up svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom CMD: /home/kfogel/src/subversion/subversion/svn/svn up svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom exited with 1
<TIME = 0.360163>
C svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/D/D1
C svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/F/alpha
C svn-test-work/working_copies/update_tests-47/local_tree_del_incoming_leaf_del/DD/D1
subversion/libsvn_subr/io.c:2681: (apr_err=235000)
svn: In file 'subversion/libsvn_wc/update_editor.c' line 2148: assertion failed (svn_path_is_ancestor(eb->current_tree_conflict, full_path))
ERROR IN: Tests scheme for update: while verifying in 'local_tree_del_incoming_leaf_del'
Traceback (most recent call last):
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/main.py", line 1133, in run
rc = self.pred.run(**kw)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/testcase.py", line 121, in run
return self.func(sandbox)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/update_tests.py", line 3984, in tree_conflicts_on_update_1_2
expected_status) ] )
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/actions.py", line 2088, in deep_trees_run_tests_scheme_for_update
error_re_string = test_case.error_re_string)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/actions.py", line 726, in run_and_verify_update
*args)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/main.py", line 533, in run_svn
*(_with_auth(_with_config_dir(varargs))))
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/main.py", line 341, in run_command
None, *varargs)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/main.py", line 471, in run_command_stdin
raise Failure
Failure
FAIL: update_tests.py 47: tree conflicts on update 1.2
[...]
CMD: svnadmin create svn-test-work/repositories/switch_tests-32 --bdb-txn-nosync "--fs-type=fsfs" <TIME = 0.031701>
CMD: svnadmin dump "svn-test-work/local_tmp/repos" | svnadmin load "svn-test-work/repositories/switch_tests-32" --ignore-uuid <TIME = 0.005680>
CMD: svn co http://localhost/svn-test-work/repositories/switch_tests-32 svn-test-work/working_copies/switch_tests-32 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.218392>
A svn-test-work/working_copies/switch_tests-32/A
A svn-test-work/working_copies/switch_tests-32/A/B
A svn-test-work/working_copies/switch_tests-32/A/B/lambda
A svn-test-work/working_copies/switch_tests-32/A/B/E
A svn-test-work/working_copies/switch_tests-32/A/B/E/alpha
A svn-test-work/working_copies/switch_tests-32/A/B/E/beta
A svn-test-work/working_copies/switch_tests-32/A/mu
A svn-test-work/working_copies/switch_tests-32/A/D
A svn-test-work/working_copies/switch_tests-32/A/D/gamma
A svn-test-work/working_copies/switch_tests-32/A/D/G
A svn-test-work/working_copies/switch_tests-32/A/D/G/pi
A svn-test-work/working_copies/switch_tests-32/A/D/G/rho
A svn-test-work/working_copies/switch_tests-32/A/D/G/tau
A svn-test-work/working_copies/switch_tests-32/A/D/H
A svn-test-work/working_copies/switch_tests-32/A/D/H/chi
A svn-test-work/working_copies/switch_tests-32/A/D/H/omega
A svn-test-work/working_copies/switch_tests-32/A/D/H/psi
A svn-test-work/working_copies/switch_tests-32/iota
A svn-test-work/working_copies/switch_tests-32/A/C
A svn-test-work/working_copies/switch_tests-32/A/B/F
Checked out revision 1.
CMD: svn add svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.057830>
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDD
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDD/D1
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDD/D1/D2
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDD/D1/D2/D3
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDF
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDF/D1
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDF/D1/D2
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDF/D1/D2/gamma
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DD
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DD/D1
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DD/D1/D2
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DF
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DF/D1
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DF/D1/beta
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/D
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/D/D1
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/F
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/F/alpha
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDD
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDD/D1
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDD/D1/D2
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDD/D1/D2/D3
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDF
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDF/D1
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDF/D1/D2
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDF/D1/D2/gamma
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DD
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DD/D1
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DD/D1/D2
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DF
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DF/D1
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DF/D1/beta
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/D
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/D/D1
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/F
A svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/F/alpha
CMD: svn commit -m "initial state" svn-test-work/working_copies/switch_tests-32 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.279907>
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/D
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/D/D1
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DD
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DD/D1
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DD/D1/D2
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDD
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDD/D1
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDD/D1/D2
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDD/D1/D2/D3
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDF
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDF/D1
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDF/D1/D2
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDF/D1/D2/gamma
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DF
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DF/D1
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DF/D1/beta
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/F
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/F/alpha
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/D
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/D/D1
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DD
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DD/D1
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DD/D1/D2
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDD
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDD/D1
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDD/D1/D2
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDD/D1/D2/D3
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDF
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDF/D1
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDF/D1/D2
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDF/D1/D2/gamma
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DF
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DF/D1
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DF/D1/beta
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/F
Adding svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/F/alpha
Transmitting file data ......
Committed revision 2.
CMD: svn rm svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/F/alpha svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/D/D1 svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DF/D1/beta svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DD/D1/D2 svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDF/D1/D2/gamma svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDD/D1/D2/D3 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.038166>
D svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/F/alpha
D svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/D/D1
D svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DF/D1/beta
D svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DD/D1/D2
D svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDF/D1/D2/gamma
D svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDD/D1/D2/D3
CMD: svn commit -m "incoming changes" svn-test-work/working_copies/switch_tests-32 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.114882>
Deleting svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/D/D1
Deleting svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DD/D1/D2
Deleting svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDD/D1/D2/D3
Deleting svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DDF/D1/D2/gamma
Deleting svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/DF/D1/beta
Deleting svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/incoming/F/alpha
Committed revision 3.
CMD: svn rm svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/F/alpha svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/D/D1 svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DF/D1 svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DD/D1 svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDF/D1 svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDD/D1 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.039790>
D svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/F/alpha
D svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/D/D1
D svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DF/D1/beta
D svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DF/D1
D svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DD/D1/D2
D svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DD/D1
D svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDF/D1/D2/gamma
D svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDF/D1/D2
D svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDF/D1
D svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDD/D1/D2/D3
D svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDD/D1/D2
D svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DDD/D1
CMD: svn switch http://localhost/svn-test-work/repositories/switch_tests-32/local_tree_del_incoming_leaf_del/incoming svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom CMD: /home/kfogel/src/subversion/subversion/svn/svn switch http://localhost/svn-test-work/repositories/switch_tests-32/local_tree_del_incoming_leaf_del/incoming svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom exited with 1
<TIME = 0.067245>
C svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/D/D1
C svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/F/alpha
C svn-test-work/working_copies/switch_tests-32/local_tree_del_incoming_leaf_del/local/DD/D1
subversion/libsvn_subr/io.c:2681: (apr_err=235000)
svn: In file 'subversion/libsvn_wc/update_editor.c' line 2148: assertion failed (svn_path_is_ancestor(eb->current_tree_conflict, full_path))
ERROR IN: Tests scheme for switch: while verifying in 'local_tree_del_incoming_leaf_del'
Traceback (most recent call last):
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/main.py", line 1133, in run
rc = self.pred.run(**kw)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/testcase.py", line 121, in run
return self.func(sandbox)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/switch_tests.py", line 2273, in tree_conflicts_on_switch_1_2
expected_status) ] )
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/actions.py", line 2268, in deep_trees_run_tests_scheme_for_switch
error_re_string = test_case.error_re_string)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/actions.py", line 1045, in run_and_verify_switch
switch_url, wc_target, *args)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/main.py", line 533, in run_svn
*(_with_auth(_with_config_dir(varargs))))
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/main.py", line 341, in run_command
None, *varargs)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/main.py", line 471, in run_command_stdin
raise Failure
Failure
FAIL: switch_tests.py 32: tree conflicts on switch 1.2
[...]
CMD: svnadmin create svn-test-work/repositories/tree_conflict_tests-2 --bdb-txn-nosync "--fs-type=fsfs" <TIME = 0.034141>
CMD: svnadmin dump "svn-test-work/local_tmp/repos" | svnadmin load "svn-test-work/repositories/tree_conflict_tests-2" --ignore-uuid <TIME = 0.005580>
CMD: svn co http://localhost/svn-test-work/repositories/tree_conflict_tests-2 svn-test-work/working_copies/tree_conflict_tests-2 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.221418>
A svn-test-work/working_copies/tree_conflict_tests-2/A
A svn-test-work/working_copies/tree_conflict_tests-2/A/B
A svn-test-work/working_copies/tree_conflict_tests-2/A/B/lambda
A svn-test-work/working_copies/tree_conflict_tests-2/A/B/E
A svn-test-work/working_copies/tree_conflict_tests-2/A/B/E/alpha
A svn-test-work/working_copies/tree_conflict_tests-2/A/B/E/beta
A svn-test-work/working_copies/tree_conflict_tests-2/A/mu
A svn-test-work/working_copies/tree_conflict_tests-2/A/D
A svn-test-work/working_copies/tree_conflict_tests-2/A/D/gamma
A svn-test-work/working_copies/tree_conflict_tests-2/A/D/G
A svn-test-work/working_copies/tree_conflict_tests-2/A/D/G/pi
A svn-test-work/working_copies/tree_conflict_tests-2/A/D/G/rho
A svn-test-work/working_copies/tree_conflict_tests-2/A/D/G/tau
A svn-test-work/working_copies/tree_conflict_tests-2/A/D/H
A svn-test-work/working_copies/tree_conflict_tests-2/A/D/H/chi
A svn-test-work/working_copies/tree_conflict_tests-2/A/D/H/omega
A svn-test-work/working_copies/tree_conflict_tests-2/A/D/H/psi
A svn-test-work/working_copies/tree_conflict_tests-2/iota
A svn-test-work/working_copies/tree_conflict_tests-2/A/C
A svn-test-work/working_copies/tree_conflict_tests-2/A/B/F
Checked out revision 1.
=== Starting a set of 'update' tests.
--- Creating changes in repos
CMD: svn mkdir --parents svn-test-work/working_copies/tree_conflict_tests-2/branch1 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.032243>
A /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/working_copies/tree_conflict_tests-2/branch1
CMD: svn add svn-test-work/working_copies/tree_conflict_tests-2/F1 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.031577>
A svn-test-work/working_copies/tree_conflict_tests-2/F1
CMD: svn mkdir svn-test-work/working_copies/tree_conflict_tests-2/D1 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.032060>
A svn-test-work/working_copies/tree_conflict_tests-2/D1
CMD: svn mkdir --parents svn-test-work/working_copies/tree_conflict_tests-2/branch1/fD --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.032213>
A /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/working_copies/tree_conflict_tests-2/branch1/fD
CMD: svn add svn-test-work/working_copies/tree_conflict_tests-2/branch1/fD/F --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.033185>
A svn-test-work/working_copies/tree_conflict_tests-2/branch1/fD/F
CMD: svn pset fprop2 "A prop of added file F." svn-test-work/working_copies/tree_conflict_tests-2/branch1/fD/F --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.032191>
property 'fprop2' set on 'svn-test-work/working_copies/tree_conflict_tests-2/branch1/fD/F'
CMD: svn mkdir --parents svn-test-work/working_copies/tree_conflict_tests-2/branch1/fM --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.033344>
A /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/working_copies/tree_conflict_tests-2/branch1/fM
CMD: svn add svn-test-work/working_copies/tree_conflict_tests-2/branch1/fM/F --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.031452>
A svn-test-work/working_copies/tree_conflict_tests-2/branch1/fM/F
CMD: svn pset fprop2 "A prop of added file F." svn-test-work/working_copies/tree_conflict_tests-2/branch1/fM/F --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.032248>
property 'fprop2' set on 'svn-test-work/working_copies/tree_conflict_tests-2/branch1/fM/F'
CMD: svn commit -m "Initial set-up." svn-test-work/working_copies/tree_conflict_tests-2 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.099258>
Adding svn-test-work/working_copies/tree_conflict_tests-2/D1
Adding svn-test-work/working_copies/tree_conflict_tests-2/F1
Adding svn-test-work/working_copies/tree_conflict_tests-2/branch1
Adding svn-test-work/working_copies/tree_conflict_tests-2/branch1/fD
Adding svn-test-work/working_copies/tree_conflict_tests-2/branch1/fD/F
Adding svn-test-work/working_copies/tree_conflict_tests-2/branch1/fM
Adding svn-test-work/working_copies/tree_conflict_tests-2/branch1/fM/F
Transmitting file data ...
Committed revision 2.
CMD: svn del svn-test-work/working_copies/tree_conflict_tests-2/branch1/fD/F --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.033006>
D svn-test-work/working_copies/tree_conflict_tests-2/branch1/fD/F
CMD: svn rename svn-test-work/working_copies/tree_conflict_tests-2/branch1/fM/F svn-test-work/working_copies/tree_conflict_tests-2/branch1/fM/F2-in --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.036128>
A svn-test-work/working_copies/tree_conflict_tests-2/branch1/fM/F2-in
D svn-test-work/working_copies/tree_conflict_tests-2/branch1/fM/F
CMD: svn commit -m Action. svn-test-work/working_copies/tree_conflict_tests-2 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.087240>
Deleting svn-test-work/working_copies/tree_conflict_tests-2/branch1/fD/F
Deleting svn-test-work/working_copies/tree_conflict_tests-2/branch1/fM/F
Adding svn-test-work/working_copies/tree_conflict_tests-2/branch1/fM/F2-in
Committed revision 3.
CMD: svn checkout -r 2 http://localhost/svn-test-work/repositories/tree_conflict_tests-2 svn-test-work/working_copies/tree_conflict_tests-2 --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.096298>
D svn-test-work/working_copies/tree_conflict_tests-2/branch1/fM/F2-in
A svn-test-work/working_copies/tree_conflict_tests-2/branch1/fM/F
A svn-test-work/working_copies/tree_conflict_tests-2/branch1/fD/F
Checked out revision 2.
=== ['fD'] onto ['ft']
--- Making local mods
--- Trying to commit (expecting 'out-of-date' error)
CMD: svn ci -m "log msg" branch1/fD --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom subversion/libsvn_client/commit.c:860: (apr_err=155011)
svn: Commit failed (details follow):
subversion/libsvn_client/commit_util.c:55: (apr_err=155011)
svn: File 'F' is out of date
subversion/libsvn_ra_serf/util.c:1563: (apr_err=160013)
svn: 'F' path not found
CMD: /home/kfogel/src/subversion/subversion/svn/svn ci -m "log msg" branch1/fD --config-dir /home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom terminated by signal 6
Sending branch1/fD/F
EXCEPTION: SVNProcessTerminatedBySignal
Traceback (most recent call last):
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/main.py", line 1133, in run
rc = self.pred.run(**kw)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/testcase.py", line 121, in run
return self.func(sandbox)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/tree_conflict_tests.py", line 549, in up_sw_file_del_onto_mod
test_tc_up_sw(sbox, f_dels + f_rpls, f_mods)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/tree_conflict_tests.py", line 515, in test_tc_up_sw
ensure_tree_conflict(sbox, 'update', incoming_scen, wc_scen, False)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/tree_conflict_tests.py", line 425, in ensure_tree_conflict
target_path)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/actions.py", line 1090, in run_and_verify_commit
*args)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/main.py", line 533, in run_svn
*(_with_auth(_with_config_dir(varargs))))
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/main.py", line 341, in run_command
None, *varargs)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/main.py", line 457, in run_command_stdin
*varargs)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/main.py", line 437, in spawn_process
exit_code = wait_on_pipe(kid, stdout_lines, stderr_lines)
File "/home/kfogel/src/subversion/subversion/tests/cmdline/svntest/main.py", line 402, in wait_on_pipe
raise SVNProcessTerminatedBySignal
SVNProcessTerminatedBySignal
FAIL: tree_conflict_tests.py 2: up/sw file: del/rpl/mv onto modify
[...]
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-12 23:22:55 CET