You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/10/25 17:53:58 UTC
svn commit: r1188742 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_wc/update_editor.c subversion/libsvn_wc/workqueue.c
subversion/tests/libsvn_wc/op-depth-test.c
Author: hwright
Date: Tue Oct 25 15:53:57 2011
New Revision: 1188742
URL: http://svn.apache.org/viewvc?rev=1188742&view=rev
Log:
Merge r1187311 from trunk:
* r1187311
Fix issue 4040, spurious NODES rows after interrupt
Justification:
Corrupts the working copy.
Votes:
+1: philip, stsp, rhuijben
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_wc/update_editor.c
subversion/branches/1.7.x/subversion/libsvn_wc/workqueue.c
subversion/branches/1.7.x/subversion/tests/libsvn_wc/op-depth-test.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 25 15:53:57 2011
@@ -68,4 +68,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,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,115
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-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,1162974,1162995,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,1178280,1178282,1178942,1179680,1179767,1180154,1181090,
1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186815
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,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,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,115
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-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,1162974,1162995,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,1178280,1178282,1178942,1179680,1179767,1180154,1181090,
1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186815,1187311
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1188742&r1=1188741&r2=1188742&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Tue Oct 25 15:53:57 2011
@@ -99,9 +99,3 @@ Approved changes:
good idea.
Votes:
+1: pburba, stsp, rhuijben
- * r1187311
- Fix issue 4040, spurious NODES rows after interrupt
- Justification:
- Corrupts the working copy.
- Votes:
- +1: philip, stsp, rhuijben
Modified: subversion/branches/1.7.x/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/update_editor.c?rev=1188742&r1=1188741&r2=1188742&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/update_editor.c Tue Oct 25 15:53:57 2011
@@ -1159,6 +1159,7 @@ modcheck_callback(void *baton,
switch (status->node_status)
{
case svn_wc_status_normal:
+ case svn_wc_status_incomplete:
case svn_wc_status_ignored:
case svn_wc_status_none:
case svn_wc_status_unversioned:
Modified: subversion/branches/1.7.x/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/workqueue.c?rev=1188742&r1=1188741&r2=1188742&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/workqueue.c Tue Oct 25 15:53:57 2011
@@ -149,7 +149,8 @@ remove_base_node(svn_wc__db_t *db,
/* Children first */
if (base_kind == svn_wc__db_kind_dir
- && base_status == svn_wc__db_status_normal)
+ && (base_status == svn_wc__db_status_normal
+ || base_status == svn_wc__db_status_incomplete))
{
const apr_array_header_t *children;
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
Modified: subversion/branches/1.7.x/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/libsvn_wc/op-depth-test.c?rev=1188742&r1=1188741&r2=1188742&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/branches/1.7.x/subversion/tests/libsvn_wc/op-depth-test.c Tue Oct 25 15:53:57 2011
@@ -3488,6 +3488,56 @@ commit_file_external(const svn_test_opts
return SVN_NO_ERROR;
}
+/* Issue 4040 */
+static svn_error_t *
+incomplete_switch(const svn_test_opts_t *opts, apr_pool_t *pool)
+{
+ svn_test__sandbox_t b;
+
+ SVN_ERR(svn_test__sandbox_create(&b, "incomplete_switch", opts, pool));
+
+ SVN_ERR(wc_mkdir(&b, "A"));
+ SVN_ERR(wc_mkdir(&b, "A/B"));
+ SVN_ERR(wc_mkdir(&b, "A/B/C"));
+ SVN_ERR(wc_mkdir(&b, "A/B/C/D"));
+ SVN_ERR(wc_commit(&b, ""));
+ SVN_ERR(wc_copy(&b, "A", "X"));
+ SVN_ERR(wc_commit(&b, ""));
+ SVN_ERR(wc_copy(&b, "A", "X/A"));
+ SVN_ERR(wc_commit(&b, ""));
+ SVN_ERR(wc_delete(&b, "X/A"));
+ SVN_ERR(wc_commit(&b, ""));
+
+ {
+ /* Interrupted switch from A@1 to X@3 */
+ nodes_row_t before[] = {
+ {0, "", "incomplete", 3, "X"},
+ {0, "A", "incomplete", 3, "X/A"},
+ {0, "A/B", "incomplete", 3, "X/A/B"},
+ {0, "A/B/C", "incomplete", 3, "X/A/B/C"},
+ {0, "B", "normal", 1, "A/B"},
+ {0, "B/C", "normal", 1, "A/B/C"},
+ {0, "B/C/D", "normal", 1, "A/B/C/D"},
+ {0}
+ };
+
+ nodes_row_t after_update[] = {
+ {0, "", "normal", 4, "X"},
+ {0, "B", "normal", 4, "A/B"},
+ {0, "B/C", "normal", 4, "A/B/C"},
+ {0, "B/C/D", "normal", 4, "A/B/C/D"},
+ {0}
+ };
+
+ SVN_ERR(insert_dirs(&b, before));
+ SVN_ERR(check_db_rows(&b, "", before));
+ SVN_ERR(wc_update(&b, "", 4));
+ SVN_ERR(check_db_rows(&b, "", after_update));
+ }
+
+ return SVN_NO_ERROR;
+}
+
/* ---------------------------------------------------------------------- */
/* The list of test functions */
@@ -3548,5 +3598,7 @@ struct svn_test_descriptor_t test_funcs[
#endif
SVN_TEST_OPTS_PASS(commit_file_external,
"commit_file_external (issue #4002)"),
+ SVN_TEST_OPTS_PASS(incomplete_switch,
+ "incomplete_switch (issue 4040)"),
SVN_TEST_NULL
};