On Sep 29, 2009, at 12:19 PM, Bert Huijben wrote:
> Author: rhuijben
> Date: Tue Sep 29 09:19:44 2009
> New Revision: 39678
>
> Log:
> Make the handling of conflicts and skipping consistent in the update
> editor. When opening the editor root, check for conflicts on the
> ancestor
> and its parent directories. This allows all editor operations to only
> check for skipping and conflicts on the target itself, helped by a few
> new booleans on the directory batons.
>
> Compared to the code accidentally committed in r39639, this is only a
> partial patch. This patch doesn't change the hashtable usage yet.
>
> ...
This change causes almost all tests to fail locally for me, similar to
the output below. I've checked out trunk using a 1.6.x-era working
copy, and something is causing Subversion to attempt to recurse up the
hierarchy to the point that it discovers subversion/tests/cmdline, and
then bails since this directory is still on the older working copy
format. This does not fail on a working copy checked out with trunk.
-Hyrum
[[[
dhcp-198-227:cmdline Hyrum$ ./basic_tests.py 1 --verbose
CMD: svnadmin create svn-test-work/local_tmp/repos --bdb-txn-nosync
<TIME = 0.048502>
CMD: svn import -m "Log message for revision 1." svn-test-work/
local_tmp/greekfiles file:///Users/Hyrum/dev/svn-trunk5/subversion/tests/cmdline/svn-test-work/local_tmp/repos
--config-dir /Users/Hyrum/dev/svn-trunk5/subversion/tests/cmdline/
svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --
username jrandom
<TIME = 0.102695>
Adding svn-test-work/local_tmp/greekfiles/A
Adding svn-test-work/local_tmp/greekfiles/A/B
Adding svn-test-work/local_tmp/greekfiles/A/B/lambda
Adding svn-test-work/local_tmp/greekfiles/A/B/E
Adding svn-test-work/local_tmp/greekfiles/A/B/E/alpha
Adding svn-test-work/local_tmp/greekfiles/A/B/E/beta
Adding svn-test-work/local_tmp/greekfiles/A/B/F
Adding svn-test-work/local_tmp/greekfiles/A/mu
Adding svn-test-work/local_tmp/greekfiles/A/C
Adding svn-test-work/local_tmp/greekfiles/A/D
Adding svn-test-work/local_tmp/greekfiles/A/D/gamma
Adding svn-test-work/local_tmp/greekfiles/A/D/G
Adding svn-test-work/local_tmp/greekfiles/A/D/G/pi
Adding svn-test-work/local_tmp/greekfiles/A/D/G/rho
Adding svn-test-work/local_tmp/greekfiles/A/D/G/tau
Adding svn-test-work/local_tmp/greekfiles/A/D/H
Adding svn-test-work/local_tmp/greekfiles/A/D/H/chi
Adding svn-test-work/local_tmp/greekfiles/A/D/H/omega
Adding svn-test-work/local_tmp/greekfiles/A/D/H/psi
Adding svn-test-work/local_tmp/greekfiles/iota
Committed revision 1.
CMD: svn co file:///Users/Hyrum/dev/svn-trunk5/subversion/tests/cmdline/svn-test-work/local_tmp/repos
svn-test-work/working_copies/basic_tests-1 --config-dir /Users/Hyrum/
dev/svn-trunk5/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom
CMD: /Users/Hyrum/dev/svn-trunk5/subversion/svn/svn co file:///Users/Hyrum/dev/svn-trunk5/subversion/tests/cmdline/svn-test-work/local_tmp/repos
svn-test-work/working_copies/basic_tests-1 --config-dir /Users/Hyrum/
dev/svn-trunk5/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom exited with 1
<TIME = 0.036670>
subversion/svn/checkout-cmd.c:173: (apr_err=155036)
subversion/libsvn_client/checkout.c:237: (apr_err=155036)
subversion/libsvn_client/update.c:293: (apr_err=155036)
subversion/libsvn_wc/deprecated.c:149: (apr_err=155036)
subversion/libsvn_repos/reporter.c:1263: (apr_err=155036)
subversion/libsvn_repos/reporter.c:1187: (apr_err=155036)
subversion/libsvn_delta/cancel.c:75: (apr_err=155036)
subversion/libsvn_delta/cancel.c:75: (apr_err=155036)
subversion/libsvn_wc/update_editor.c:1335: (apr_err=155036)
subversion/libsvn_wc/update_editor.c:1820: (apr_err=155036)
subversion/libsvn_wc/update_editor.c:5277: (apr_err=155036)
subversion/libsvn_wc/entries.c:1246: (apr_err=155036)
subversion/libsvn_wc/entries.c:1221: (apr_err=155036)
subversion/libsvn_wc/entries.c:1067: (apr_err=155036)
subversion/libsvn_wc/wc_db.c:4503: (apr_err=155036)
subversion/libsvn_wc/wc_db.c:1005: (apr_err=155036)
subversion/libsvn_wc/wc_db.c:384: (apr_err=155036)
subversion/libsvn_wc/upgrade.c:710: (apr_err=155036)
svn: Working copy format of '/Users/Hyrum/dev/svn-trunk5/subversion/
tests/cmdline' is too old (10); please run 'svn upgrade'
Traceback (most recent call last):
File "/Users/Hyrum/dev/svn-trunk5/subversion/tests/cmdline/svntest/
main.py", line 1166, in run
rc = self.pred.run(sandbox)
File "/Users/Hyrum/dev/svn-trunk5/subversion/tests/cmdline/svntest/
testcase.py", line 146, in run
return self.func(sandbox)
File "./basic_tests.py", line 49, in basic_checkout
sbox.build(read_only = True)
File "/Users/Hyrum/dev/svn-trunk5/subversion/tests/cmdline/svntest/
sandbox.py", line 96, in build
if svntest.actions.make_repo_and_wc(self, create_wc, read_only):
File "/Users/Hyrum/dev/svn-trunk5/subversion/tests/cmdline/svntest/
actions.py", line 1501, in make_repo_and_wc
expected_wc)
File "/Users/Hyrum/dev/svn-trunk5/subversion/tests/cmdline/svntest/
actions.py", line 358, in run_and_verify_checkout
URL, wc_dir_name, *args)
File "/Users/Hyrum/dev/svn-trunk5/subversion/tests/cmdline/svntest/
main.py", line 598, in run_svn
*(_with_auth(_with_config_dir(varargs))))
File "/Users/Hyrum/dev/svn-trunk5/subversion/tests/cmdline/svntest/
main.py", line 366, in run_command
None, *varargs)
File "/Users/Hyrum/dev/svn-trunk5/subversion/tests/cmdline/svntest/
main.py", line 531, in run_command_stdin
raise Failure
Failure
FAIL: basic_tests.py 1: basic checkout of a wc
]]]
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2401803
Received on 2009-09-30 00:14:31 CEST