From dev-return-2834-daniel=haxx.se@subversion.apache.org Wed Mar 24 02:12:06 2010 Return-Path: Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by giant.haxx.se (8.14.3/8.14.3/Debian-9) with SMTP id o2O1C4r6019982 for ; Wed, 24 Mar 2010 02:12:05 +0100 Received: (qmail 72253 invoked by uid 500); 24 Mar 2010 01:12:06 -0000 Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@subversion.apache.org Received: (qmail 72238 invoked by uid 99); 24 Mar 2010 01:12:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Mar 2010 01:12:06 +0000 X-ASF-Spam-Status: No, hits=-0.5 required=10.0 tests=AWL,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [82.173.186.92] (HELO vip.vsoft.nl) (82.173.186.92) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Mar 2010 01:12:01 +0000 Received: from vip.alh.net.qqn.nl (localhost [127.0.0.1]) by mx0.qqn.nl (Postfix) with ESMTP id 3257F73344; Wed, 24 Mar 2010 02:11:39 +0100 (CET) X-Virus-Scanned: by amavisd-new/Clam Antivirus at mx0.qqn.nl Received: from mx0.qqn.nl ([127.0.0.1]) by vip.alh.net.qqn.nl (vip.alh.net.qqn.nl [127.0.0.1]) (amavisd-new, port 10024) with LMTP id fC+7ix47OMk2; Wed, 24 Mar 2010 02:11:34 +0100 (CET) Received: from Quad (quad.alh.net.qqn.nl [192.168.0.11]) by mx0.qqn.nl (Postfix) with ESMTP id 90948732FC; Wed, 24 Mar 2010 02:11:34 +0100 (CET) From: "Bert Huijben" To: , References: <20100323221622.330F9238897F@eris.apache.org> In-Reply-To: <20100323221622.330F9238897F@eris.apache.org> Subject: RE: svn commit: r926814 - in /subversion/trunk/subversion/libsvn_wc: adm_ops.c update_editor.c workqueue.c Date: Wed, 24 Mar 2010 02:11:34 +0100 Message-ID: <002a01cacaee$f2466f90$d6d34eb0$@nl> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Mailer: Microsoft Office Outlook 12.0 Thread-Index: AcrK1oeV2lU52zeqS4uYbFDmWdtmwQAGBH0A Content-Language: nl > -----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 >=20 > Author: gstein > Date: Tue Mar 23 22:16:21 2010 > New Revision: 926814 >=20 > URL: http://svn.apache.org/viewvc?rev=3D926814&view=3Drev > Log: > Use the new file installation work item within = svn_wc_add_repos_file4() >=20 > * 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. >=20 > * subversion/libsvn_wc/adm_ops.c: > (svn_wc__get_pristine_contents): added nodes *do* have pristines >=20 > * 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/l= ocal_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/l= ocal_tmp/config --password rayjandom --no-auth-cache --username jrandom = exited with 1