> -----Original Message-----
> From: s...@apache.org [mailto:s...@apache.org]
> Sent: woensdag 22 februari 2012 18:24
> To: comm...@subversion.apache.org
> Subject: svn commit: r1292402 - in /subversion/branches/1.7.x-issue4102: ./
> subversion/libsvn_wc/ subversion/tests/cmdline/
>
> Author: stsp
> Date: Wed Feb 22 17:23:37 2012
> New Revision: 1292402
>
> URL: http://svn.apache.org/viewvc?rev=1292402&view=rev
> Log:
> On the 1.7.x-issue4102 branch, merge the following from trunk, resolving
> conflicts: r1233292, r1245711, r1245746, r1245764, r1245809, r1245929,
> r1245935
>
> Modified:
> subversion/branches/1.7.x-issue4102/ (props changed)
> subversion/branches/1.7.x-issue4102/subversion/libsvn_wc/adm_ops.c
> subversion/branches/1.7.x-issue4102/subversion/libsvn_wc/status.c
> subversion/branches/1.7.x-issue4102/subversion/libsvn_wc/wc_db.c
> subversion/branches/1.7.x-
> issue4102/subversion/libsvn_wc/wc_db_private.h
> subversion/branches/1.7.x-
> issue4102/subversion/libsvn_wc/wc_db_wcroot.c
> subversion/branches/1.7.x-
> issue4102/subversion/tests/cmdline/special_tests.py
>
> Propchange: subversion/branches/1.7.x-issue4102/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Wed Feb 22 17:23:37 2012
> @@ -76,4 +76,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,11465
> 55,1146606,1146620,1146684,1146762,1146781,1146832,1146834,1146870,1146
> 899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,114
> 8131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,11
> 48877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1
> 149240,1149343,1149371-
> 1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,114970
> 1,1149713,1150242,1150254,1150260-
> 1150261,1150266,1150302,1150327,1150344,1150368,1150372,1150441,115050
> 6,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,11521
> 29,1152140,1152189-
> 1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,115341
> 6,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,11541
> 19,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154
> 278,1154379,1154382,1154461,1154717-
> 1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,115516
> 0,1155313,1155334,1155391,115
>
> 5404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,11
> 56750,1156827,1156838,1157416,1158187,1158193-
> 1158194,1158196,1158201,1158207,1158209-
> 1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,115842
> 1,1158436,1158455,1158616-
> 1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,115892
> 3-
> 1158924,1158929,1158963,1159093,1159098,1159101,1159132,1159136,115914
> 8,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,11606
> 82,1160704-
> 1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,116202
> 4,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163372,11633
> 83,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164
> 554,1164580,1164614,1164645,1164760,1164765,1166267,1166500,1166555,116
> 6678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,11
> 69531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1
> 174761,1174797-
> 1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,117828
> 0,
>
> 1178282,1178942,1179680,1179767,1179776,1180154,1181090,1181110,118115
> 5,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,11830
> 54,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185
> 746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,118
> 6107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,11
> 86784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1
> 188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,
> 1189665,1195480,1197135,1197998,1199876,1199950,1200837,1201002,120107
> 2,1201419,1201824,1202135,1202187,1202630,1202807,1203546,1203651,12036
> 53,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205
> 839,1205848,1206523,1206533,1206576,1206718-
> 1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,120782
> 3,1207858,1207949,1208840,1209631,1209654,1210195,1211483,1211859,12118
> 85,1212476,1212482,1212484,1213331,1213673,1213681,1213690,1213711,1213
> 716,1214139,1215260,12152
> 88,1215374-
> 1215375,1215379,1220742,1220750,1221178,1221303,1221767,1221780,122179
> 3,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,12272
> 37,1227250,1227352,1227372,1227384-
> 1227385,1227900,1228340,1229252,1229303,1229677,1229833,1229980,123021
> 2,1231029,1231944-1231945,1232202,1232207,1232221-
> 1232222,1232413,1235264,1235296,1235302,1235736,1236163,1236173,123628
> 3,1236343,1237720,1239382,1239596,1239631,1239655,1239747,1240314,12404
> 85,1240752,1241530,1241553,1241713,1241726,1242116,1242537,1242607
> +/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146
> 555,1146606,1146620,1146684,1146762,1146781,1146832,1146834,1146870,114
> 6899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,11
> 48131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1
> 148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,
> 1149240,1149343,1149371-
> 1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,114970
> 1,1149713,1150242,1150254,1150260-
> 1150261,1150266,1150302,1150327,1150344,1150368,1150372,1150441,115050
> 6,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,11521
> 29,1152140,1152189-
> 1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,115341
> 6,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,11541
> 19,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154
> 278,1154379,1154382,1154461,1154717-
> 1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,115516
> 0,1155313,1155334,1155391,115
>
> 5404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,11
> 56750,1156827,1156838,1157416,1158187,1158193-
> 1158194,1158196,1158201,1158207,1158209-
> 1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,115842
> 1,1158436,1158455,1158616-
> 1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,115892
> 3-
> 1158924,1158929,1158963,1159093,1159098,1159101,1159132,1159136,115914
> 8,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,11606
> 82,1160704-
> 1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,116202
> 4,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163372,11633
> 83,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164
> 554,1164580,1164614,1164645,1164760,1164765,1166267,1166500,1166555,116
> 6678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,11
> 69531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1
> 174761,1174797-
> 1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,117828
> 0,
>
> 1178282,1178942,1179680,1179767,1179776,1180154,1181090,1181110,118115
> 5,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,11830
> 54,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185
> 746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,118
> 6107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,11
> 86784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1
> 188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,
> 1189665,1195480,1197135,1197998,1199876,1199950,1200837,1201002,120107
> 2,1201419,1201824,1202135,1202187,1202630,1202807,1203546,1203651,12036
> 53,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205
> 839,1205848,1206523,1206533,1206576,1206718-
> 1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,120782
> 3,1207858,1207949,1208840,1209631,1209654,1210195,1211483,1211859,12118
> 85,1212476,1212482,1212484,1213331,1213673,1213681,1213690,1213711,1213
> 716,1214139,1215260,12152
> 88,1215374-
> 1215375,1215379,1220742,1220750,1221178,1221303,1221767,1221780,122179
> 3,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,12272
> 37,1227250,1227352,1227372,1227384-
> 1227385,1227900,1228340,1229252,1229303,1229677,1229833,1229980,123021
> 2,1231029,1231944-1231945,1232202,1232207,1232221-
> 1232222,1232413,1233292,1235264,1235296,1235302,1235736,1236163,123617
> 3,1236283,1236343,1237720,1239382,1239596,1239631,1239655,1239747,12403
> 14,1240485,1240752,1241530,1241553,1241713,1241726,1242116,1242537,1242
> 607,1245711,1245746,1245764,1245809,1245929,1245935
>
> Modified: subversion/branches/1.7.x-
> issue4102/subversion/libsvn_wc/adm_ops.c
> URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-
> issue4102/subversion/libsvn_wc/adm_ops.c?rev=1292402&r1=1292401&r2=
> 1292402&view=diff
> ==========================================================
> ====================
> --- subversion/branches/1.7.x-issue4102/subversion/libsvn_wc/adm_ops.c
> (original)
> +++ subversion/branches/1.7.x-issue4102/subversion/libsvn_wc/adm_ops.c
> Wed Feb 22 17:23:37 2012
> @@ -1553,8 +1553,15 @@ revert_restore(svn_wc__db_t *db,
> }
> else if (on_disk == svn_node_file && kind != svn_wc__db_kind_file)
> {
> - SVN_ERR(svn_io_remove_file2(local_abspath, FALSE, scratch_pool));
> - on_disk = svn_node_none;
> +#ifdef HAVE_SYMLINK
> + /* Preserve symlinks pointing at directories. Changes on the
> + * directory node have been reverted. The symlink should remain. */
> + if (!(special && kind == svn_wc__db_kind_dir))
> +#endif
> + {
> + SVN_ERR(svn_io_remove_file2(local_abspath, FALSE,
> scratch_pool));
> + on_disk = svn_node_none;
> + }
> }
> else if (on_disk == svn_node_file)
> {
>
> Modified: subversion/branches/1.7.x-
> issue4102/subversion/libsvn_wc/status.c
> URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-
> issue4102/subversion/libsvn_wc/status.c?rev=1292402&r1=1292401&r2=129
> 2402&view=diff
> ==========================================================
> ====================
> --- subversion/branches/1.7.x-issue4102/subversion/libsvn_wc/status.c
> (original)
> +++ subversion/branches/1.7.x-issue4102/subversion/libsvn_wc/status.c
> Wed Feb 22 17:23:37 2012
> @@ -1111,13 +1111,38 @@ get_dir_status(const struct walk_status_
> {
> /* Handle "this-dir" first. */
> if (! skip_this_dir)
> - SVN_ERR(send_status_structure(wb, local_abspath,
> - parent_repos_root_url,
> - parent_repos_relpath,
> - parent_repos_uuid,
> - dir_info, dirent, get_all,
> - status_func, status_baton,
> - iterpool));
> + {
> +#ifdef HAVE_SYMLINK
> + if (dirent->special)
> + {
> + svn_io_dirent2_t *this_dirent = svn_io_dirent2_dup(dirent,
> + iterpool);
> +
> + /* We're being pointed to "this-dir" via a symlink.
> + * Get the real node kind and pretend the path is not a
> symlink.
> + * This prevents send_status_structure() from treating this-dir
> + * as a directory obstructed by a file. */
> + SVN_ERR(svn_io_check_resolved_path(local_abspath,
> + &this_dirent->kind,
> iterpool));
> + this_dirent->special = FALSE;
> + SVN_ERR(send_status_structure(wb, local_abspath,
> + parent_repos_root_url,
> + parent_repos_relpath,
> + parent_repos_uuid,
> + dir_info, this_dirent, get_all,
> + status_func, status_baton,
> + iterpool));
This doesn't look like the right function to apply this fix. This function is
called for all subdirectories as well, while your fix should only apply to the
root?
Bert
