Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C37E17DDF for ; Wed, 14 Sep 2011 15:05:10 +0000 (UTC) Received: (qmail 41879 invoked by uid 500); 14 Sep 2011 15:05:10 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 41836 invoked by uid 500); 14 Sep 2011 15:05:10 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 41828 invoked by uid 99); 14 Sep 2011 15:05:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Sep 2011 15:05:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Sep 2011 15:05:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 11B0C238889B for ; Wed, 14 Sep 2011 15:04:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1170669 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_wc/wc-queries.sql subversion/libsvn_wc/wc_db.c subversion/tests/cmdline/externals_tests.py Date: Wed, 14 Sep 2011 15:04:41 -0000 To: commits@subversion.apache.org From: hwright@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110914150442.11B0C238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hwright Date: Wed Sep 14 15:04:41 2011 New Revision: 1170669 URL: http://svn.apache.org/viewvc?rev=1170669&view=rev Log: Reintegrate the 1.7.x-r1163557 branch: * r1163557 Relax wcng consistency checks for file externals. Justification: Debug build claims wcng DB is inconsistent when it is OK. Branch: 1.7.x-r1163557 Votes: +1: philip, rhuijben, neels Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.c subversion/branches/1.7.x/subversion/tests/cmdline/externals_tests.py Propchange: subversion/branches/1.7.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Sep 14 15:04:41 2011 @@ -8,6 +8,7 @@ /subversion/branches/1.7.x-r1152189:1152759-1154249 /subversion/branches/1.7.x-r1155160:1158704-1159223 /subversion/branches/1.7.x-r1159093:1159097-1159230 +/subversion/branches/1.7.x-r1163557:1163574-1170648 /subversion/branches/atomic-revprop:965046-1000689 /subversion/branches/bdb-reverse-deltas:872050-872529 /subversion/branches/diff-callbacks3:870059-870761 @@ -63,4 +64,4 @@ /subversion/branches/tree-conflicts:868291-873154 /subversion/branches/tree-conflicts-notify:873926-874008 /subversion/branches/uris-as-urls:1060426-1064427 -/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,115 8193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1163792,1163953,1164027,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269 +/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,115 8193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1163557,1163792,1163953,1164027,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269 Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1170669&r1=1170668&r2=1170669&view=diff ============================================================================== --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Sep 14 15:04:41 2011 @@ -138,12 +138,3 @@ Veto-blocked changes: Approved changes: ================= - - * r1163557 - Relax wcng consistency checks for file externals. - Justification: - Debug build claims wcng DB is inconsistent when it is OK. - Branch: - 1.7.x-r1163557 - Votes: - +1: philip, rhuijben, neels Modified: subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql?rev=1170669&r1=1170668&r2=1170669&view=diff ============================================================================== --- subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql (original) +++ subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql Wed Sep 14 15:04:41 2011 @@ -1346,7 +1346,7 @@ WHERE wc_id = ?1 /* Queries for verification. */ -- STMT_SELECT_ALL_NODES -SELECT op_depth, local_relpath, parent_relpath FROM nodes +SELECT op_depth, local_relpath, parent_relpath, file_external FROM nodes WHERE wc_id == ?1 /* ------------------------------------------------------------------------- */ Modified: subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.c URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.c?rev=1170669&r1=1170668&r2=1170669&view=diff ============================================================================== --- subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.c (original) +++ subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.c Wed Sep 14 15:04:41 2011 @@ -12248,7 +12248,7 @@ verify_wcroot(svn_wc__db_wcroot_t *wcroo /* Verify parent_relpath refers to a row that exists */ /* TODO: Verify there is a suitable parent row - e.g. has op_depth <= * the child's and a suitable presence */ - if (parent_relpath) + if (parent_relpath && svn_sqlite__column_is_null(stmt, 3)) { svn_sqlite__stmt_t *stmt2; svn_boolean_t have_a_parent_row; Modified: subversion/branches/1.7.x/subversion/tests/cmdline/externals_tests.py URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/externals_tests.py?rev=1170669&r1=1170668&r2=1170669&view=diff ============================================================================== --- subversion/branches/1.7.x/subversion/tests/cmdline/externals_tests.py (original) +++ subversion/branches/1.7.x/subversion/tests/cmdline/externals_tests.py Wed Sep 14 15:04:41 2011 @@ -1884,6 +1884,23 @@ def exclude_externals(sbox): None, None, None, None, False, '--set-depth', 'infinity', wc_dir) +def file_external_in_unversioned(sbox): + "file external in unversioned dir" + + sbox.build() + wc_dir = sbox.wc_dir + + sbox.simple_propset('svn:externals', '^/A/mu X/mu', 'A') + + expected_output = svntest.wc.State(wc_dir, { + 'A/X/mu' : Item(status='A '), + }) + svntest.actions.run_and_verify_update(wc_dir, expected_output, None, None) + + # At one point this failed with SVN_DEBUG wcng consistency checks enabled + svntest.actions.run_and_verify_svn(None, None, [], 'cleanup', wc_dir) + + from svntest import verify, actions, main @Issue(3589, 4000) @@ -2082,6 +2099,7 @@ test_list = [ None, incoming_file_on_file_external, incoming_file_external_on_file, exclude_externals, + file_external_in_unversioned, copy_file_externals, ]