You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2011/08/31 13:23:34 UTC
svn commit: r1163577 - in /subversion/branches/1.7.x-r1163557: ./
subversion/libsvn_wc/wc-queries.sql subversion/libsvn_wc/wc_db.c
subversion/tests/cmdline/externals_tests.py
Author: philip
Date: Wed Aug 31 11:23:34 2011
New Revision: 1163577
URL: http://svn.apache.org/viewvc?rev=1163577&view=rev
Log:
Resolve conflict in externals_tests.py when merging r1163557 to 1.7.x
* r1163557
Relax wcng consistency checks for file externals.
Modified:
subversion/branches/1.7.x-r1163557/ (props changed)
subversion/branches/1.7.x-r1163557/subversion/libsvn_wc/wc-queries.sql
subversion/branches/1.7.x-r1163557/subversion/libsvn_wc/wc_db.c
subversion/branches/1.7.x-r1163557/subversion/tests/cmdline/externals_tests.py
Propchange: subversion/branches/1.7.x-r1163557/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 31 11:23:34 2011
@@ -61,4 +61,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,1162024,1162033,1162201,1162516,1162880
+/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,1162024,1162033,1162201,1162516,1162880,1163557
Modified: subversion/branches/1.7.x-r1163557/subversion/libsvn_wc/wc-queries.sql
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1163557/subversion/libsvn_wc/wc-queries.sql?rev=1163577&r1=1163576&r2=1163577&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1163557/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/branches/1.7.x-r1163557/subversion/libsvn_wc/wc-queries.sql Wed Aug 31 11:23:34 2011
@@ -1340,7 +1340,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-r1163557/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1163557/subversion/libsvn_wc/wc_db.c?rev=1163577&r1=1163576&r2=1163577&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1163557/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/branches/1.7.x-r1163557/subversion/libsvn_wc/wc_db.c Wed Aug 31 11:23:34 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-r1163557/subversion/tests/cmdline/externals_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1163557/subversion/tests/cmdline/externals_tests.py?rev=1163577&r1=1163576&r2=1163577&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1163557/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/branches/1.7.x-r1163557/subversion/tests/cmdline/externals_tests.py Wed Aug 31 11:23:34 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)
+
+
########################################################################
# Run the tests
@@ -1922,6 +1939,7 @@ test_list = [ None,
incoming_file_on_file_external,
incoming_file_external_on_file,
exclude_externals,
+ file_external_in_unversioned,
]
if __name__ == '__main__':