You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Bert Huijben <be...@qqmail.nl> on 2010/03/24 01:11:34 UTC
RE: svn commit: r926814 - in /subversion/trunk/subversion/libsvn_wc: adm_ops.c update_editor.c workqueue.c
> -----Original Message-----
> From: gstein@apache.org [mailto:gstein@apache.org]
> Sent: dinsdag 23 maart 2010 23:16
> To: commits@subversion.apache.org
> Subject: svn commit: r926814 - in
> /subversion/trunk/subversion/libsvn_wc: adm_ops.c update_editor.c
> workqueue.c
>
> Author: gstein
> Date: Tue Mar 23 22:16:21 2010
> New Revision: 926814
>
> URL: http://svn.apache.org/viewvc?rev=926814&view=rev
> Log:
> Use the new file installation work item within svn_wc_add_repos_file4()
>
> * subversion/libsvn_wc/update_editor.c:
> (svn_wc_add_repos_file4): remove computation of DST_TXTB since we
> already have it as TEXT_BASE_PATH. add comment about possibly using
> OP_FILE_INSTALL when a separate working file (as distinct from just
> the text base) is provided. remove the old section about installing
> from the base, and do it later as a work item. add a comment to
> clarify what svn_wc__install_props() is doing w.r.t work items.
> only
> do an (extra) run of the workqueue before we make a call to
> db_temp_op_set_working_last_change; otherwise, we can wait and run
> everything all at once.
>
> * subversion/libsvn_wc/adm_ops.c:
> (svn_wc__get_pristine_contents): added nodes *do* have pristines
>
> * subversion/libsvn_wc/workqueue.c:
> (run_file_install): assert that we got a pristine stream (this work
> item
> should not have been used, otherwise!)
Hi Greg,
This patch breaks export test 11 on more than one buildbot:
FAIL: export_tests.py 11: export working copy at base revision
CMD: svn export svn-test-work/working_copies/export_tests-11 svn-test-work/working_copies/export_tests-11.export -rBASE --config-dir /home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom
CMD: /home/bt/slaves/x64-centos/build/subversion/svn/svn export svn-test-work/working_copies/export_tests-11 svn-test-work/working_copies/export_tests-11.export -rBASE --config-dir /home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom exited with 1
<TIME = 0.090459>
subversion/svn/export-cmd.c:104: (apr_err=2)
subversion/libsvn_client/export.c:1080: (apr_err=2)
subversion/libsvn_client/export.c:426: (apr_err=2)
subversion/libsvn_client/export.c:164: (apr_err=2)
subversion/libsvn_subr/stream.c:745: (apr_err=2)
subversion/libsvn_subr/stream.c:745: (apr_err=2)
subversion/libsvn_subr/stream.c:745: (apr_err=2)
subversion/libsvn_subr/io.c:2696: (apr_err=2)
svn: Can't open file '/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svn-test-work/working_copies/export_tests-11/.svn/text-base/kappa.svn-base': No such file or directory
Traceback (most recent call last):
File "/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svntest/main.py", line 1197, in run
rc = self.pred.run(sandbox)
File "/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svntest/testcase.py", line 160, in run
return self.func(sandbox)
File "/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/export_tests.py", line 293, in export_working_copy_at_base_revision
'-rBASE')
File "/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svntest/actions.py", line 390, in run_and_verify_export
URL, export_dir_name, *args)
File "/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svntest/main.py", line 604, in run_svn
return run_command(svn_binary, error_expected, 0,
File "/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svntest/main.py", line 366, in run_command
None, *varargs)
File "/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svntest/main.py", line 538, in run_command_stdin
raise Failure
Failure
Bert
Re: RE: svn commit: r926814 - in /subversion/trunk/subversion/libsvn_wc:
adm_ops.c update_editor.c workqueue.c
Posted by Greg Stein <gs...@gmail.com>.
Yup. Thanks. Saw this before heading to dinner, thinking it was due to new
changes. Realized "no" about 15 minutes ago. Will fix ASAP.
On Mar 23, 2010 9:12 PM, "Bert Huijben" <be...@qqmail.nl> wrote:
> -----Original Message-----
> From: gstein@apache.org [mailto:gstein@apache.org]
> Sent: dinsdag ...
Hi Greg,
This patch breaks export test 11 on more than one buildbot:
FAIL: export_tests.py 11: export working copy at base revision
CMD: svn export svn-test-work/working_copies/export_tests-11
svn-test-work/working_copies/export_tests-11.export -rBASE --config-dir
/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom
CMD: /home/bt/slaves/x64-centos/build/subversion/svn/svn export
svn-test-work/working_copies/export_tests-11
svn-test-work/working_copies/export_tests-11.export -rBASE --config-dir
/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom exited with 1
<TIME = 0.090459>
subversion/svn/export-cmd.c:104: (apr_err=2)
subversion/libsvn_client/export.c:1080: (apr_err=2)
subversion/libsvn_client/export.c:426: (apr_err=2)
subversion/libsvn_client/export.c:164: (apr_err=2)
subversion/libsvn_subr/stream.c:745: (apr_err=2)
subversion/libsvn_subr/stream.c:745: (apr_err=2)
subversion/libsvn_subr/stream.c:745: (apr_err=2)
subversion/libsvn_subr/io.c:2696: (apr_err=2)
svn: Can't open file
'/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svn-test-work/working_copies/export_tests-11/.svn/text-base/kappa.svn-base':
No such file or directory
Traceback (most recent call last):
File
"/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svntest/main.py",
line 1197, in run
rc = self.pred.run(sandbox)
File
"/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svntest/testcase.py",
line 160, in run
return self.func(sandbox)
File
"/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/export_tests.py",
line 293, in export_working_copy_at_base_revision
'-rBASE')
File
"/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svntest/actions.py",
line 390, in run_and_verify_export
URL, export_dir_name, *args)
File
"/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svntest/main.py",
line 604, in run_svn
return run_command(svn_binary, error_expected, 0,
File
"/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svntest/main.py",
line 366, in run_command
None, *varargs)
File
"/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svntest/main.py",
line 538, in run_command_stdin
raise Failure
Failure
Bert
Re: RE: svn commit: r926814 - in /subversion/trunk/subversion/libsvn_wc:
adm_ops.c update_editor.c workqueue.c
Posted by Greg Stein <gs...@gmail.com>.
Yup. Thanks. Saw this before heading to dinner, thinking it was due to new
changes. Realized "no" about 15 minutes ago. Will fix ASAP.
On Mar 23, 2010 9:12 PM, "Bert Huijben" <be...@qqmail.nl> wrote:
> -----Original Message-----
> From: gstein@apache.org [mailto:gstein@apache.org]
> Sent: dinsdag ...
Hi Greg,
This patch breaks export test 11 on more than one buildbot:
FAIL: export_tests.py 11: export working copy at base revision
CMD: svn export svn-test-work/working_copies/export_tests-11
svn-test-work/working_copies/export_tests-11.export -rBASE --config-dir
/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom
CMD: /home/bt/slaves/x64-centos/build/subversion/svn/svn export
svn-test-work/working_copies/export_tests-11
svn-test-work/working_copies/export_tests-11.export -rBASE --config-dir
/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom exited with 1
<TIME = 0.090459>
subversion/svn/export-cmd.c:104: (apr_err=2)
subversion/libsvn_client/export.c:1080: (apr_err=2)
subversion/libsvn_client/export.c:426: (apr_err=2)
subversion/libsvn_client/export.c:164: (apr_err=2)
subversion/libsvn_subr/stream.c:745: (apr_err=2)
subversion/libsvn_subr/stream.c:745: (apr_err=2)
subversion/libsvn_subr/stream.c:745: (apr_err=2)
subversion/libsvn_subr/io.c:2696: (apr_err=2)
svn: Can't open file
'/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svn-test-work/working_copies/export_tests-11/.svn/text-base/kappa.svn-base':
No such file or directory
Traceback (most recent call last):
File
"/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svntest/main.py",
line 1197, in run
rc = self.pred.run(sandbox)
File
"/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svntest/testcase.py",
line 160, in run
return self.func(sandbox)
File
"/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/export_tests.py",
line 293, in export_working_copy_at_base_revision
'-rBASE')
File
"/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svntest/actions.py",
line 390, in run_and_verify_export
URL, export_dir_name, *args)
File
"/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svntest/main.py",
line 604, in run_svn
return run_command(svn_binary, error_expected, 0,
File
"/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svntest/main.py",
line 366, in run_command
None, *varargs)
File
"/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svntest/main.py",
line 538, in run_command_stdin
raise Failure
Failure
Bert