You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2011/12/13 16:47:48 UTC
svn commit: r1213744 - in /subversion/branches/1.7.x: ./
subversion/include/private/ subversion/libsvn_client/
subversion/libsvn_fs_fs/ subversion/libsvn_subr/ subversion/tests/cmdline/
Author: danielsh
Date: Tue Dec 13 15:47:47 2011
New Revision: 1213744
URL: http://svn.apache.org/viewvc?rev=1213744&view=rev
Log:
Merge the r1211859 group from trunk:
* r1211859, r1211885
Fix issue 4074, SEGV on "svn rm ROOT_URL"
Justification:
It's a SEGV.
Votes:
+1: philip, rhuijben, steveking
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/CHANGES (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/include/private/svn_adler32.h (props changed)
subversion/branches/1.7.x/subversion/include/private/svn_string_private.h (props changed)
subversion/branches/1.7.x/subversion/include/private/svn_temp_serializer.h (props changed)
subversion/branches/1.7.x/subversion/libsvn_client/delete.c
subversion/branches/1.7.x/subversion/libsvn_fs_fs/temp_serializer.c (props changed)
subversion/branches/1.7.x/subversion/libsvn_fs_fs/temp_serializer.h (props changed)
subversion/branches/1.7.x/subversion/libsvn_subr/adler32.c (props changed)
subversion/branches/1.7.x/subversion/libsvn_subr/hash.c (props changed)
subversion/branches/1.7.x/subversion/libsvn_subr/svn_temp_serializer.c (props changed)
subversion/branches/1.7.x/subversion/tests/cmdline/basic_tests.py (contents, props changed)
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 15:47:47 2011
@@ -69,4 +69,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,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1197135,1197998,1199876,1199950,1200837,1201002,1201824,1202135,1202187,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205193,1205726,1205839,1205848,1206523,1206533
+/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,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1197135,1197998,1199876,1199950,1200837,1201002,1201824,1202135,1202187,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205193,1205726,1205839,1205848,1206523,1206533,1211859,1211885
Propchange: subversion/branches/1.7.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 15:47:47 2011
@@ -59,4 +59,4 @@
/subversion/branches/tree-conflicts/CHANGES:868291-873154
/subversion/branches/tree-conflicts-notify/CHANGES:873926-874008
/subversion/branches/uris-as-urls/CHANGES:1060426-1064427
-/subversion/trunk/CHANGES:1145993-1200899,1204598-1207934
+/subversion/trunk/CHANGES:1145993-1200899,1204598-1207934,1211859,1211885
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1213744&r1=1213743&r2=1213744&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Tue Dec 13 15:47:47 2011
@@ -134,13 +134,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1211859, r1211885
- Fix issue 4074, SEGV on "svn rm ROOT_URL"
- Justification:
- It's a SEGV.
- Votes:
- +1: philip, rhuijben, steveking
-
* r1207858, r1207949
Replace two assertions that say that your working copy is broken with
error messages that supply a bit more information about what is broken.
Propchange: subversion/branches/1.7.x/subversion/include/private/svn_adler32.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 15:47:47 2011
@@ -44,4 +44,4 @@
/subversion/branches/tc_url_rev/subversion/libsvn_diff/diff.h:874351-874483
/subversion/branches/tree-conflicts/subversion/libsvn_diff/diff.h:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/libsvn_diff/diff.h:873926-874008
-/subversion/trunk/subversion/include/private/svn_adler32.h:1189190,1189395
+/subversion/trunk/subversion/include/private/svn_adler32.h:1189190,1189395,1211859,1211885
Propchange: subversion/branches/1.7.x/subversion/include/private/svn_string_private.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 15:47:47 2011
@@ -53,4 +53,4 @@
/subversion/branches/tree-conflicts/subversion/include/svn_string.h:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/include/svn_string.h:873926-874008
/subversion/branches/uris-as-urls/subversion/include/svn_string.h:1060426-1064427
-/subversion/trunk/subversion/include/private/svn_string_private.h:1149240,1189190,1189395
+/subversion/trunk/subversion/include/private/svn_string_private.h:1149240,1189190,1189395,1211859,1211885
Propchange: subversion/branches/1.7.x/subversion/include/private/svn_temp_serializer.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 15:47:47 2011
@@ -1,2 +1,2 @@
/subversion/branches/revprop-packing/subversion/include/private/svn_temp_serializer.h:1143907,1143971,1144017,1144568
-/subversion/trunk/subversion/include/private/svn_temp_serializer.h:1067687-1072301,1189190,1189395
+/subversion/trunk/subversion/include/private/svn_temp_serializer.h:1067687-1072301,1189190,1189395,1211859,1211885
Modified: subversion/branches/1.7.x/subversion/libsvn_client/delete.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_client/delete.c?rev=1213744&r1=1213743&r2=1213744&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_client/delete.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_client/delete.c Tue Dec 13 15:47:47 2011
@@ -272,6 +272,12 @@ delete_urls_multi_repos(const apr_array_
APR_ARRAY_PUSH(relpaths_list, const char *) = repos_relpath;
}
+ /* Check we identified a non-root relpath. Return an RA error
+ code for 1.6 compatibility. */
+ if (!repos_relpath || !*repos_relpath)
+ return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
+ "URL '%s' not within a repository", uri);
+
/* Now, test to see if the thing actually exists. */
SVN_ERR(svn_ra_check_path(ra_session, repos_relpath, SVN_INVALID_REVNUM,
&kind, pool));
Propchange: subversion/branches/1.7.x/subversion/libsvn_fs_fs/temp_serializer.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 15:47:47 2011
@@ -1,2 +1,2 @@
/subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.c:1143907,1143971,1144017,1144568
-/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c:1067687-1072301,1189190,1189395
+/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c:1067687-1072301,1189190,1189395,1211859,1211885
Propchange: subversion/branches/1.7.x/subversion/libsvn_fs_fs/temp_serializer.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 15:47:47 2011
@@ -1,2 +1,2 @@
/subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.h:1143907,1143971,1144017,1144568
-/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h:1067687-1072301,1189190,1189395
+/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h:1067687-1072301,1189190,1189395,1211859,1211885
Propchange: subversion/branches/1.7.x/subversion/libsvn_subr/adler32.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 15:47:47 2011
@@ -2,4 +2,4 @@
/subversion/branches/diff-optimizations-bytes/subversion/libsvn_subr/adler32.c:1037353-1067789
/subversion/branches/performance/subversion/libsvn_subr/adler32.c:1067697-1078365
/subversion/branches/revprop-packing/subversion/libsvn_subr/adler32.c:1143907,1143971,1144017,1144568
-/subversion/trunk/subversion/libsvn_subr/adler32.c:1189190,1189395
+/subversion/trunk/subversion/libsvn_subr/adler32.c:1189190,1189395,1211859,1211885
Propchange: subversion/branches/1.7.x/subversion/libsvn_subr/hash.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 15:47:47 2011
@@ -53,4 +53,4 @@
/subversion/branches/tree-conflicts/subversion/libsvn_subr/hash.c:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/libsvn_subr/hash.c:873926-874008
/subversion/branches/uris-as-urls/subversion/libsvn_subr/hash.c:1060426-1064427
-/subversion/trunk/subversion/libsvn_subr/hash.c:1189190,1189395
+/subversion/trunk/subversion/libsvn_subr/hash.c:1189190,1189395,1211859,1211885
Propchange: subversion/branches/1.7.x/subversion/libsvn_subr/svn_temp_serializer.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 15:47:47 2011
@@ -1,2 +1,2 @@
/subversion/branches/revprop-packing/subversion/libsvn_subr/svn_temp_serializer.c:1143907,1143971,1144017,1144568
-/subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c:1067687-1072301,1189190,1189395
+/subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c:1067687-1072301,1189190,1189395,1211859,1211885
Modified: subversion/branches/1.7.x/subversion/tests/cmdline/basic_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/basic_tests.py?rev=1213744&r1=1213743&r2=1213744&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/branches/1.7.x/subversion/tests/cmdline/basic_tests.py Tue Dec 13 15:47:47 2011
@@ -999,6 +999,7 @@ def verify_dir_deleted(path):
return 1
+@Issue(687,4074)
def basic_delete(sbox):
"basic delete command"
@@ -1190,6 +1191,12 @@ def basic_delete(sbox):
'rm', '-m', 'delete iota URL',
iota_URL)
+ # Issue 4074, deleting a root url SEGV.
+ expected_error = 'svn: E170000: .*not within a repository'
+ svntest.actions.run_and_verify_svn(None, [], expected_error,
+ 'rm', sbox.repo_url,
+ '--message', 'delete root')
+
#----------------------------------------------------------------------
def basic_checkout_deleted(sbox):
Propchange: subversion/branches/1.7.x/subversion/tests/cmdline/basic_tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 15:47:47 2011
@@ -64,4 +64,4 @@
/subversion/branches/tree-conflicts/subversion/tests/cmdline/basic_tests.py:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/tests/cmdline/basic_tests.py:873926-874008
/subversion/branches/uris-as-urls/subversion/tests/cmdline/basic_tests.py:1060426-1064427
-/subversion/trunk/subversion/tests/cmdline/basic_tests.py: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,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,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,115
6312,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,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174111,1174652,1174761,1174797-1174798,1174806,1175888,1176949,1177001,1177492,1179680,1179767,1181155,1181666,1185222,1189190,1189395,1200837
+/subversion/trunk/subversion/tests/cmdline/basic_tests.py: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,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,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,115
6312,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,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174111,1174652,1174761,1174797-1174798,1174806,1175888,1176949,1177001,1177492,1179680,1179767,1181155,1181666,1185222,1189190,1189395,1200837,1211859,1211885