Author: hwright
Date: Fri Nov 18 18:12:30 2011
New Revision: 1203778
URL: http://svn.apache.org/viewvc?rev=1203778&view=rev
Log:
Merge r1186944, r1186981, r1186983, r1187676 from trunk:
* r1186944, r1186981, r1186983, r1187676
Fix an assertion failure when a symlink is updated.
Justification:
Regression in 1.7.0.
Notes:
r1186944 is the actual fix, including a new test
r1186981 fixes spurious failures of the new test
r1186983 whitespace to avoid conflict
r1187676 is a cosmetic follow-up tweak
Votes:
+1: stsp, philip, 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/tests/cmdline/special_tests.py
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 18:12:30 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,1186784,1186815,1186928,1187311,1188609,1189190,1189395,1189580,1189665,1197998,1199950,1200837,1201002,1202135,1202187,1202807
+/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,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1188609,1189190,1189395,1189580,1189665,1197998,1199950,1200837,1201002,1202135,1202187,1202807
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1203778&r1=1203777&r2=1203778&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Nov 18 18:12:30 2011
@@ -115,18 +115,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1186944, r1186981, r1186983, r1187676
- Fix an assertion failure when a symlink is updated.
- Justification:
- Regression in 1.7.0.
- Notes:
- r1186944 is the actual fix, including a new test
- r1186981 fixes spurious failures of the new test
- r1186983 whitespace to avoid conflict
- r1187676 is a cosmetic follow-up tweak
- Votes:
- +1: stsp, philip, rhuijben
-
* r1202630
Catch base files with no checksum.
Justification:
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=1203778&r1=1203777&r2=1203778&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 Fri Nov 18
18:12:30 2011
@@ -4049,28 +4049,28 @@ close_file(void *file_baton,
if (!fb->shadowed
&& (! fb->adding_file || fb->add_existed))
{
- svn_boolean_t local_is_link = FALSE;
- svn_boolean_t incoming_is_link = FALSE;
+ svn_boolean_t local_is_link;
+ svn_boolean_t incoming_is_link;
+ int i;
local_is_link = apr_hash_get(local_actual_props,
SVN_PROP_SPECIAL,
APR_HASH_KEY_STRING) != NULL;
- {
- int i;
+ incoming_is_link = local_is_link;
- for (i = 0; i < regular_prop_changes->nelts; ++i)
- {
- const svn_prop_t *prop = &APR_ARRAY_IDX(regular_prop_changes, i,
- svn_prop_t);
-
- if (strcmp(prop->name, SVN_PROP_SPECIAL) == 0)
- {
- incoming_is_link = TRUE;
- }
- }
- }
+ /* Does an incoming propchange affect symlink-ness? */
+ for (i = 0; i < regular_prop_changes->nelts; ++i)
+ {
+ const svn_prop_t *prop = &APR_ARRAY_IDX(regular_prop_changes, i,
+ svn_prop_t);
+ if (strcmp(prop->name, SVN_PROP_SPECIAL) == 0)
+ {
+ incoming_is_link = (prop->value != NULL);
+ break;
+ }
+ }
if (local_is_link != incoming_is_link)
{
Modified: subversion/branches/1.7.x/subversion/tests/cmdline/special_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/special_tests.py?rev=1203778&r1=1203777&r2=1203778&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/tests/cmdline/special_tests.py
(original)
+++ subversion/branches/1.7.x/subversion/tests/cmdline/special_tests.py Fri Nov
18 18:12:30 2011
@@ -860,6 +860,49 @@ def symlink_to_wc_svnversion(sbox):
symlink_path, sbox.repo_url,
[ "1\n" ], [])
+# Regression in 1.7.0: Update fails to change a symlink
+@SkipUnless(svntest.main.is_posix_os)
+def update_symlink(sbox):
+ "update a symlink"
+
+ svntest.actions.do_sleep_for_timestamps()
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+ mu_path = sbox.ospath('A/mu')
+ iota_path = sbox.ospath('iota')
+ symlink_path = sbox.ospath('symlink')
+
+ # create a symlink to /A/mu
+ os.symlink("A/mu", symlink_path)
+ sbox.simple_add('symlink')
+ sbox.simple_commit()
+
+ # change the symlink to /iota
+ os.remove(symlink_path)
+ os.symlink("iota", symlink_path)
+ sbox.simple_commit()
+
+ # update back to r2
+ svntest.main.run_svn(False, 'update', '-r', '2', wc_dir)
+
+ # now update to head; 1.7.0 throws an assertion here
+ expected_output = svntest.wc.State(wc_dir, {
+ 'symlink' : Item(status='U '),
+ })
+ expected_disk = svntest.main.greek_state.copy()
+ expected_disk.add({'symlink': Item(contents="This is the file 'iota'.\n",
+ props={'svn:special' : '*'})})
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
+ expected_status.add({
+ 'symlink' : Item(status=' ', wc_rev='3'),
+ })
+ svntest.actions.run_and_verify_update(wc_dir,
+ expected_output,
+ expected_disk,
+ expected_status,
+ None, None, None,
+ None, None, 1)
########################################################################
# Run the tests
@@ -887,6 +930,7 @@ test_list = [ None,
merge_foreign_symlink,
symlink_to_wc_basic,
symlink_to_wc_svnversion,
+ update_symlink,
]
if __name__ == '__main__':
