You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2015/07/28 13:18:39 UTC
svn commit: r1693068 [1/2] - in /subversion/branches/1.7.x-issue4340-repos:
./ build/ build/ac-macros/ build/generator/ build/generator/templates/
subversion/bindings/swig/include/ subversion/include/
subversion/libsvn_client/ subversion/libsvn_fs_fs/ ...
Author: brane
Date: Tue Jul 28 11:18:37 2015
New Revision: 1693068
URL: http://svn.apache.org/r1693068
Log:
On the 1.7.x-issue4340-repos branch: Sync with 1.7.x and resolve conflicts.
Added:
subversion/branches/1.7.x-issue4340-repos/subversion/tests/cmdline/mod_authz_svn_tests.py
- copied unchanged from r1693067, subversion/branches/1.7.x/subversion/tests/cmdline/mod_authz_svn_tests.py
Modified:
subversion/branches/1.7.x-issue4340-repos/ (props changed)
subversion/branches/1.7.x-issue4340-repos/CHANGES (contents, props changed)
subversion/branches/1.7.x-issue4340-repos/Makefile.in
subversion/branches/1.7.x-issue4340-repos/NOTICE (contents, props changed)
subversion/branches/1.7.x-issue4340-repos/STATUS
subversion/branches/1.7.x-issue4340-repos/build/ac-macros/apache.m4
subversion/branches/1.7.x-issue4340-repos/build/generator/gen_vcnet_vcproj.py
subversion/branches/1.7.x-issue4340-repos/build/generator/gen_win.py
subversion/branches/1.7.x-issue4340-repos/build/generator/templates/svn_config.vcxproj.ezt
subversion/branches/1.7.x-issue4340-repos/build/generator/templates/vcnet_vcxproj.ezt
subversion/branches/1.7.x-issue4340-repos/build/generator/templates/zlib.vcxproj.ezt
subversion/branches/1.7.x-issue4340-repos/build/run_tests.py
subversion/branches/1.7.x-issue4340-repos/gen-make.py
subversion/branches/1.7.x-issue4340-repos/subversion/bindings/swig/include/apr.swg
subversion/branches/1.7.x-issue4340-repos/subversion/bindings/swig/include/svn_types.swg
subversion/branches/1.7.x-issue4340-repos/subversion/include/svn_version.h
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_client/copy.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_client/patch.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_repos/rev_hunt.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/config.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/error.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/opt.c
subversion/branches/1.7.x-issue4340-repos/subversion/mod_authz_svn/mod_authz_svn.c
subversion/branches/1.7.x-issue4340-repos/subversion/mod_dav_svn/deadprops.c
subversion/branches/1.7.x-issue4340-repos/subversion/mod_dav_svn/reports/get-location-segments.c
subversion/branches/1.7.x-issue4340-repos/subversion/svnrdump/load_editor.c
subversion/branches/1.7.x-issue4340-repos/subversion/svnserve/serve.c
subversion/branches/1.7.x-issue4340-repos/subversion/tests/cmdline/README
subversion/branches/1.7.x-issue4340-repos/subversion/tests/cmdline/authz_tests.py
subversion/branches/1.7.x-issue4340-repos/subversion/tests/cmdline/copy_tests.py
subversion/branches/1.7.x-issue4340-repos/subversion/tests/cmdline/davautocheck.sh
subversion/branches/1.7.x-issue4340-repos/subversion/tests/cmdline/patch_tests.py
subversion/branches/1.7.x-issue4340-repos/subversion/tests/cmdline/svnrdump_tests.py
subversion/branches/1.7.x-issue4340-repos/subversion/tests/cmdline/svntest/ (props changed)
subversion/branches/1.7.x-issue4340-repos/subversion/tests/cmdline/svntest/main.py
subversion/branches/1.7.x-issue4340-repos/subversion/tests/libsvn_repos/repos-test.c
subversion/branches/1.7.x-issue4340-repos/subversion/tests/libsvn_subr/config-test.c
subversion/branches/1.7.x-issue4340-repos/win-tests.py
Propchange: subversion/branches/1.7.x-issue4340-repos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 28 11:18:37 2015
@@ -1,7 +1,9 @@
/subversion/1.7.x-issue4059:1239661-1239744
/subversion/branches/1.5.x-r30215:870312
-/subversion/branches/1.7.x:1480943-1645438
+/subversion/branches/1.7.x:1480943-1693067
/subversion/branches/1.7.x-JavaHL-pools:1158684-1158722
+/subversion/branches/1.7.x-VS2015:1692104-1692782
+/subversion/branches/1.7.x-buildfix-neon:1660567-1664788
/subversion/branches/1.7.x-diff-translate:1568403-1569065
/subversion/branches/1.7.x-disable_zlib_asm:1593915-1615219
/subversion/branches/1.7.x-fsfs-commit:1536760-1541380
@@ -32,6 +34,7 @@
/subversion/branches/1.7.x-issue4428:1525912-1538136
/subversion/branches/1.7.x-issue4460:1563069-1564892
/subversion/branches/1.7.x-issue4480:1588781-1590205
+/subversion/branches/1.7.x-issue4551:1654802-1687153
/subversion/branches/1.7.x-issue4k:1166502-1167193
/subversion/branches/1.7.x-javahl-exception-crash:1586451-1589333
/subversion/branches/1.7.x-log-diff:1295670-1295699
@@ -83,18 +86,24 @@
/subversion/branches/1.7.x-r1527103:1527110-1541378
/subversion/branches/1.7.x-r1541790:1541792-1542083
/subversion/branches/1.7.x-r1551579:1551587-1589566
+/subversion/branches/1.7.x-r1561419:1655580-1687155
/subversion/branches/1.7.x-r1564215:1564280-1564618
/subversion/branches/1.7.x-r1568872-neon+serf:1568942-1569623
/subversion/branches/1.7.x-r1574868:1575332-1642628
/subversion/branches/1.7.x-r1580626:1580636-1590207
/subversion/branches/1.7.x-r1594157:1594673-1643028
/subversion/branches/1.7.x-r1641564:1641574-1642630
+/subversion/branches/1.7.x-r1644595:1644692-1667437
+/subversion/branches/1.7.x-r1646797:1646806-1664786
+/subversion/branches/1.7.x-r1667941:1667944-1668188
+/subversion/branches/1.7.x-r1674455:1674471-1687159
/subversion/branches/1.7.x-san-cert:1614969-1615212
/subversion/branches/1.7.x-serf-1.3.x-Windows:1543441-1589564
/subversion/branches/1.7.x-serf-server-root-segfaults:1383952-1392726
/subversion/branches/1.7.x-svn-patch-eol-fixes:1207511-1235924
/subversion/branches/1.8.x:1577779
/subversion/branches/1.8.x-issue4480:1588775
+/subversion/branches/1.8.x-issue4551:1654799
/subversion/branches/1.8.x-javahl-exception-crash:1586439
/subversion/branches/1.8.x-openssl-dirs:1535139
/subversion/branches/1.8.x-serf-1.3+-windows:1517123
@@ -152,4 +161,6 @@
/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,1146762,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,1150344,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,115
6085,1156098,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,1158923-1158924,1158929,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,1163372,1163383,1163557,1163792,1163953,1164027,1164116,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1164929,1166267,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174342,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,
1178280,1178282,1178942,1179680,1179767,1179776,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,1190463,1195480,1197135,1197998,1199876,1199950,1200277,1200837,1200896,1201002,1201072,1201419,1201824,1202132,1202135,1202187,1202333,1202630,1202807,1203546,1203651,1203653,1203977,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1205968,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210147,1210195,1210913,1211048,1211483,1211859,1211885,1212476,12124
82,1212484,1213331,1213673,1213681,1213690,1213711,1213716,1214139,1215260,1215288,1215374-1215375,1215379,1220740,1220742,1220750,1220861,1221178,1221303,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1227237,1227250,1227352,1227372,1227384-1227385,1227900,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1230714,1230798,1231029,1231944-1231945,1232202,1232207,1232221-1232222,1232267,1232413,1233292,1235264,1235296,1235302,1235736,1236163,1236173,1236283,1236343,1237720,1237779,1238121,1239382,1239596,1239631,1239655,1239747,1240314,1240485,1240619,1240752,1241530,1241553,1241599,1241626,1241713,1241726,1242116,1242537,1242607,1242759,1242770,1242794,1243694,1243840,1243920,1243976,1244303,1244317,1244466,1244551,1245284-1245285,1245711,1245738,1245746,1245764,1245809,1245817,1245929,1245935,1291429,1291446,1291520,1291594,1291680,1291685,1291700,1291704,1291726,1291729,1291797,1291810,1291941,1292090,1292248,1292255,1292260,1292296,12
92322,1292507,1292516,1292768,1292827,1292926,1293229,1293577,1293945,1293972,1293976,1293998,1294134,1294136,1294147,1294236,1294470,1294586,1295007,1295303,1295372,1295418,1296251,1296303,1296369,1296691,1297522,1298343,1300265,1302399,1302417,1302539,1302588,1302591,1302613,1305853,1306111,1306275,1306334,1307177,1309865,1309992,1310378,1310428,1310535,1310594,1311702,1311747,1311935,1325361,1327474,1327490,1327495,1327979,1328002,1328038,1328144,1328267-1328268,1328353,1328846-1328847,1328852,1328878,1329388,1329417,1329876,1330258,1330382,1330444,1330520,1335104,1335555,1337441,1338291,1338297,1338314,1338688,1338708,1338713,1338739,1338748,1338810,1339159,1339164,1340556,1341012,1341031,1341034,1341076,1341544,1341560,1342984,1344864-1344865,1344869,1345482,1345740,1346765,1348822,1349215,1349367,1349371,1349380,1349778,1351117,1351772,1352031,1352068,1353572,1354626,1354652,1354876,1354907,1355340,1361007,1361019,1361341,1362508,1365519,1365549,1365554,1365556,1365592,1367498
,1368065,1368128,1368197-1368198,1371282,1374198,1374800,1374802,1375052,1375089,1376414,1378847,1380175,1380295,1380697,1382843,1383029,1383466,1383483,1383946,1386594,1386601,1387226,1387943,1388975,1389364,1389499,1389658,1389851,1389878,1389928,1390653,1390965,1391020,1391022,1391641,1391935,1392502,1392599,1393061,1393156,1393165,1393542,1393551,1393598,1394519,1396285,1398100,1399174,1401915,1402417,1402421,1403258,1403583,1403588,1403691,1403964,1403982,1404912,1405922,1407131,1407812,1408650,1409146,1409939,1410106,1410203,1413402,1419670-1419681,1421011,1421103,1421380,1421541,1422053,1422100,1423585,1423646,1423837,1423840,1423848,1424977,1425368,1426138,1426264,1426752,1426830,1427197,1427210,1427278,1429201,1434128,1434405,1434414,1434418,1434435,1434476,1434750,1435361,1438602,1438683,1441810,1443763,1443929,1445753,1451678,1452617,1452780,1452967,1453780,1454088,1454217,1455352,1458341,1459599,1461278,1461562,1461580,1461701,1461743,1461760,1462041,1462293,1462300,1462
302,1462321,1462334,1465975,1476359,1477730,1481010,1481627,1482282,1483781,1485350,1490684,1496127,1503528,1507044,1512432,1512471-1512472,1513463,1513472,1514763,1515119,1515237,1515992,1515997,1516023-1516024,1516051-1516052,1516565,1516806,1518184,1520529,1520532,1520539,1522892,1524869,1527103,1527105,1535551,1535591,1537360,1537415,1537555,1537700,1539309,1541705,1541790,1542042,1542069,1542071,1542119,1542129,1542610,1544295,1544316,1545835,1545845,1550691,1550772,1551579,1557320,1560690,1561237,1563066-1563068,1564215,1564576,1564966,1564969,1565531,1566503,1567492,1567494,1568180,1568349,1568872,1569069,1574868,1577200,1577739,1577755,1580626,1580650,1587968,1588772,1590212,1591123,1594156,1595431,1600909,1615219,1615255-1615256,1636874,1637826,1640730,1640862,1640873,1641564,1643033,1643409,1643437,1643457,1643793,1643810,1643972
+/subversion/branches/v1.7.x-VS2012-15:1667823-1687157
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146762,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,1150344,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,115
6085,1156098,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,1158923-1158924,1158929,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,1163372,1163383,1163557,1163792,1163953,1164027,1164116,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1164929,1166267,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174342,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,
1178280,1178282,1178942,1179680,1179767,1179776,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,1190463,1195480,1197135,1197998,1199876,1199950,1200277,1200837,1200896,1201002,1201072,1201419,1201824,1202132,1202135,1202187,1202333,1202630,1202807,1203546,1203651,1203653,1203977,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1205968,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210147,1210195,1210913,1211048,1211483,1211859,1211885,1212476,12124
82,1212484,1213331,1213673,1213681,1213690,1213711,1213716,1214139,1215260,1215288,1215374-1215375,1215379,1220740,1220742,1220750,1220861,1221178,1221303,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1227237,1227250,1227352,1227372,1227384-1227385,1227900,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1230714,1230798,1231029,1231944-1231945,1232202,1232207,1232221-1232222,1232267,1232413,1233292,1235264,1235296,1235302,1235736,1236163,1236173,1236283,1236343,1237720,1237779,1238121,1239382,1239596,1239631,1239655,1239747,1240314,1240485,1240619,1240752,1241530,1241553,1241599,1241626,1241713,1241726,1242116,1242537,1242607,1242759,1242770,1242794,1243694,1243840,1243920,1243976,1244303,1244317,1244466,1244551,1245284-1245285,1245711,1245738,1245746,1245764,1245809,1245817,1245929,1245935,1291429,1291446,1291520,1291594,1291680,1291685,1291700,1291704,1291726,1291729,1291797,1291810,1291941,1292090,1292248,1292255,1292260,1292296,12
92322,1292507,1292516,1292768,1292827,1292926,1293229,1293577,1293945,1293972,1293976,1293998,1294134,1294136,1294147,1294236,1294470,1294586,1295007,1295303,1295372,1295418,1296251,1296303,1296369,1296691,1297522,1298343,1300265,1302399,1302417,1302539,1302588,1302591,1302613,1305853,1306111,1306275,1306334,1307177,1309865,1309992,1310378,1310428,1310535,1310594,1311702,1311747,1311935,1325361,1327474,1327490,1327495,1327979,1328002,1328038,1328144,1328267-1328268,1328353,1328846-1328847,1328852,1328878,1329388,1329417,1329876,1330258,1330382,1330444,1330520,1335104,1335555,1337441,1338291,1338297,1338314,1338688,1338708,1338713,1338739,1338748,1338810,1339159,1339164,1340556,1341012,1341031,1341034,1341076,1341544,1341560,1342984,1344864-1344865,1344869,1345482,1345740,1346765,1348822,1349215,1349367,1349371,1349380,1349778,1351117,1351772,1352031,1352068,1353572,1354626,1354652,1354876,1354907,1355340,1361007,1361019,1361341,1362508,1365519,1365549,1365554,1365556,1365592,1367498
,1368065,1368128,1368197-1368198,1371282,1374198,1374800,1374802,1375052,1375089,1376414,1378847,1380175,1380295,1380697,1382843,1383029,1383466,1383483,1383946,1386594,1386601,1387226,1387943,1388975,1389364,1389499,1389658,1389851,1389878,1389928,1390653,1390965,1391020,1391022,1391641,1391935,1392502,1392599,1393061,1393156,1393165,1393542,1393551,1393598,1394519,1396285,1398100,1399174,1401915,1402417,1402421,1403258,1403583,1403588,1403691,1403964,1403982,1404912,1405922,1407131,1407812,1408650,1409146,1409939,1410106,1410203,1413402,1419670-1419681,1421011,1421103,1421380,1421541,1422053,1422100,1423585,1423646,1423837,1423840,1423848,1424977,1425368,1426138,1426264,1426752,1426830,1427197,1427210,1427278,1429201,1434128,1434405,1434414,1434418,1434435,1434476,1434750,1435361,1438602,1438683,1441810,1443763,1443929,1445753,1451678,1452617,1452780,1452967,1453780,1454088,1454217,1455352,1458341,1459599,1461278,1461562,1461580,1461701,1461743,1461760,1462041,1462293,1462300,1462
302,1462321,1462334,1465975,1476359,1477730,1481010,1481627,1482282,1483781,1485350,1490684,1496127,1503528,1507044,1512432,1512471-1512472,1513463,1513472,1514763,1515119,1515237,1515992,1515997,1516023-1516024,1516051-1516052,1516565,1516806,1518184,1520529,1520532,1520539,1522892,1524869,1527103,1527105,1535551,1535591,1537360,1537415,1537555,1537700,1539309,1541705,1541790,1542042,1542069,1542071,1542119,1542129,1542610,1544295,1544302-1544303,1544316,1545835,1545845,1550691,1550772,1551579,1557320,1560690,1561237,1561419,1563066-1563068,1564215,1564576,1564966,1564969,1565531,1566503,1567492,1567494,1568180,1568349,1568872,1569069,1574868,1577200,1577739,1577755,1580626,1580650,1587968,1588772,1590212,1591123,1594156,1595431,1600909,1615219,1615255-1615256,1636874,1637826,1640730,1640862,1640873,1641564,1643033,1643409,1643437,1643457,1643793,1643810,1643972,1644158,1644530,1644595,1644599,1646785-1646786,1646797,1651759,1652182,1652195,1652200,1652744,1653622-1653623,1653988,1
654039,1654162,1654186,1654271,1664612,1667233,1667235,1667260-1667261,1667485,1667941,1667976,1668618,1671388,1674455-1674456,1692798-1692799
+/subversion/trunk/subversion/tests:1652182
Modified: subversion/branches/1.7.x-issue4340-repos/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/CHANGES?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/CHANGES (original)
+++ subversion/branches/1.7.x-issue4340-repos/CHANGES Tue Jul 28 11:18:37 2015
@@ -1,3 +1,45 @@
+Version 1.7.21
+(5 Aug 2015, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.21
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * cp: fix 'svn cp ^/A/D/H@1 ^/A' to properly create A (r1674455, r1674456)
+ * fix issue #4551: svnrdump load commits wrong properties, or fails, on a
+ non-deltas dumpfile (r1652182 et al.)
+
+ - Server-side bugfixes:
+ * fix 'svnadmin recover' for pre-1.4 FSFS repositories (r1561419)
+
+ Developer-visible changes:
+ - General:
+ * support building on Windows with Visual Studio 2012, 2013 and 2015 (r1687158, r1692783)
+
+ - Bindings:
+ * swig-pl: fix some stack memory problems (r1668618, 1671388)
+
+Version 1.7.20
+(31 Mar 2015, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.20
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * fix 'svn patch' output for reordered hunks (issue #4533)
+
+ - Server-side bugfixes:
+ * reject invalid get-location-segments requests in mod_dav_svn and
+ svnserve (r1667233)
+ * mod_dav_svn: reject invalid txnprop change requests (r1667235)
+
+ - Client-side and server-side bugfixes:
+ * properly duplicate svn error objects (r1651759)
+ * fix use-after-free in config parser (1646785, r1646786, r1646797)
+
+ Developer-visible changes:
+ * add lock file config for testing against HTTPD 2.4+ (r1544302, r1544303)
+ * fix build with absolute path to neon install (r1664789)
+
+
Version 1.7.19
(15 Dec 2014, from /branches/1.7.x)
http://svn.apache.org/repos/asf/subversion/tags/1.7.19
Propchange: subversion/branches/1.7.x-issue4340-repos/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 28 11:18:37 2015
@@ -1,5 +1,5 @@
/subversion/branches/1.5.x-r30215/CHANGES:870312
-/subversion/branches/1.7.x/CHANGES:1480943-1645438
+/subversion/branches/1.7.x/CHANGES:1480943-1693067
/subversion/branches/1.7.x-JavaHL-pools/CHANGES:1158684-1158722
/subversion/branches/1.7.x-issue3888/CHANGES:1148937-1149162
/subversion/branches/1.7.x-issue4087/CHANGES:1243707-1336073
@@ -65,4 +65,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-1485430,1485497,1485501,1485508,1503795,1503850,1515237,1515992,1515997,1516023-1516024,1516051-1516052,1516565,1541705,1542119,1542129,1564966,1564969,1565530,1569069,1573006,1590212,1615255-1615256,1643033,1643457,1643972
+/subversion/trunk/CHANGES:1145993-1692794
Modified: subversion/branches/1.7.x-issue4340-repos/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/Makefile.in?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/Makefile.in (original)
+++ subversion/branches/1.7.x-issue4340-repos/Makefile.in Tue Jul 28 11:18:37 2015
@@ -316,6 +316,7 @@ INSTALL_EXTRA_SWIG_RB=\
done
APXS = @APXS@
+HTTPD_VERSION = @HTTPD_VERSION@
PYTHON = @PYTHON@
PERL = @PERL@
@@ -463,6 +464,9 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
if test "$(HTTP_LIBRARY)" != ""; then \
flags="--http-library $(HTTP_LIBRARY) $$flags"; \
fi; \
+ if test "$(HTTPD_VERSION)" != ""; then \
+ flags="--httpd-version $(HTTPD_VERSION) $$flags"; \
+ fi; \
if test "$(SERVER_MINOR_VERSION)" != ""; then \
flags="--server-minor-version $(SERVER_MINOR_VERSION) $$flags"; \
fi; \
Modified: subversion/branches/1.7.x-issue4340-repos/NOTICE
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/NOTICE?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/NOTICE (original)
+++ subversion/branches/1.7.x-issue4340-repos/NOTICE Tue Jul 28 11:18:37 2015
@@ -1,5 +1,5 @@
Apache Subversion
-Copyright 2014 The Apache Software Foundation
+Copyright 2015 The Apache Software Foundation
This product includes software developed by many people, and distributed
under Contributor License Agreements to The Apache Software Foundation
Propchange: subversion/branches/1.7.x-issue4340-repos/NOTICE
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 28 11:18:37 2015
@@ -1,6 +1,6 @@
/subversion/1.7.x-issue4059/NOTICE:1239661-1239744
/subversion/branches/1.5.x-r30215/NOTICE:870312
-/subversion/branches/1.7.x/NOTICE:1480943-1645438
+/subversion/branches/1.7.x/NOTICE:1480943-1693067
/subversion/branches/1.7.x-JavaHL-pools/NOTICE:1158684-1158722
/subversion/branches/1.7.x-diff-translate/NOTICE:1568403-1569065
/subversion/branches/1.7.x-disable_zlib_asm/NOTICE:1593915-1615219
@@ -89,6 +89,7 @@
/subversion/branches/1.7.x-r1580626/NOTICE:1580636-1590207
/subversion/branches/1.7.x-r1594157/NOTICE:1594673-1643028
/subversion/branches/1.7.x-r1641564/NOTICE:1641574-1642630
+/subversion/branches/1.7.x-r1667941/NOTICE:1667944-1668188
/subversion/branches/1.7.x-san-cert/NOTICE:1614969-1615212
/subversion/branches/1.7.x-serf-1.3.x-Windows/NOTICE:1543441-1589564
/subversion/branches/1.7.x-serf-server-root-segfaults/NOTICE:1383952-1392726
@@ -152,4 +153,4 @@
/subversion/branches/tree-conflicts/NOTICE:868291-873154
/subversion/branches/tree-conflicts-notify/NOTICE:873926-874008
/subversion/branches/uris-as-urls/NOTICE:1060426-1064427
-/subversion/trunk/NOTICE:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146762,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,1150344,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,1155
404,1156085,1156098,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,1158923-1158924,1158929,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,1163372,1163383,1163557,1163792,1163953,1164027,1164116,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1164929,1166267,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174342,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1
177732,1178280,1178282,1178942,1179680,1179767,1179776,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,1190463,1195480,1197135,1197998,1199876,1199950,1200277,1200837,1200896,1201002,1201072,1201419,1201824,1202132,1202135,1202187,1202333,1202630,1202807,1203546,1203651,1203653,1203977,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1205968,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210147,1210195,1210913,1211048,1211483,1211859,1211885,121247
6,1212482,1212484,1213331,1213673,1213681,1213690,1213711,1213716,1214139,1215260,1215288,1215374-1215375,1215379,1220740,1220742,1220750,1220861,1221178,1221303,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1227237,1227250,1227352,1227372,1227384-1227385,1227900,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1230714,1230798,1231029,1231944-1231945,1232202,1232207,1232221-1232222,1232267,1232413,1233292,1235264,1235296,1235302,1235736,1236163,1236173,1236283,1236343,1237720,1237779,1238121,1239382,1239596,1239631,1239655,1239747,1240314,1240485,1240619,1240752,1241530,1241553,1241599,1241626,1241713,1241726,1242116,1242537,1242607,1242759,1242770,1242794,1243694,1243840,1243920,1243976,1244303,1244317,1244466,1244551,1245284-1245285,1245711,1245738,1245746,1245764,1245809,1245817,1245929,1245935,1291429,1291446,1291520,1291594,1291680,1291685,1291700,1291704,1291726,1291729,1291797,1291810,1291941,1292090,1292248,1292255,1292260,129
2296,1292322,1292507,1292516,1292768,1292827,1292926,1293229,1293577,1293945,1293972,1293976,1293998,1294134,1294136,1294147,1294236,1294470,1294586,1295007,1295303,1295372,1295418,1296251,1296303,1296369,1296691,1297522,1298343,1300265,1302399,1302417,1302539,1302588,1302591,1302613,1305853,1306111,1306275,1306334,1307177,1309865,1309992,1310378,1310428,1310535,1310594,1311702,1311747,1311935,1325361,1327474,1327490,1327495,1327979,1328002,1328038,1328144,1328267-1328268,1328353,1328846-1328847,1328852,1328878,1329388,1329417,1329876,1330258,1330382,1330444,1330520,1335104,1335555,1337441,1338291,1338297,1338314,1338688,1338708,1338713,1338739,1338748,1338810,1339159,1339164,1340556,1341012,1341031,1341034,1341076,1341544,1341560,1342984,1344864-1344865,1344869,1345482,1345740,1346765,1348822,1349215,1349367,1349371,1349380,1349778,1351117,1351772,1352031,1352068,1353572,1354626,1354652,1354876,1354907,1355340,1361007,1361019,1361341,1362508,1365519,1365549,1365554,1365556,1365592,
1367498,1368065,1368128,1368197-1368198,1371282,1374198,1374800,1374802,1375052,1375089,1376414,1378847,1380175,1380295,1380697,1382843,1383029,1383466,1383483,1383946,1386594,1386601,1387226,1387943,1388975,1389364,1389499,1389658,1389851,1389878,1389928,1390653,1390965,1391020,1391022,1391641,1391935,1392502,1392599,1393061,1393156,1393165,1393542,1393551,1393598,1394519,1396285,1398100,1399174,1401915,1402417,1402421,1403258,1403583,1403588,1403691,1403964,1403982,1404912,1405922,1407131,1407812,1408650,1409146,1409939,1410106,1410203,1413402,1419670-1419681,1421011,1421103,1421380,1421541,1422053,1422100,1423585,1423646,1423837,1423840,1423848,1424977,1425368,1426138,1426264,1426752,1426830,1427197,1427210,1427278,1429201,1434128,1434405,1434414,1434418,1434435,1434476,1434750,1435361,1438602,1438683,1441810,1443763,1443929,1445753,1451678,1452617,1452780,1452967,1453780,1454088,1454217,1455352,1458341,1459599,1461278,1461562,1461580,1461701,1461743,1461760,1462041,1462293,14623
00,1462302,1462321,1462334,1465975,1476359,1477730,1481010,1481627,1482282,1483781,1485350,1490684,1496127,1503528,1507044,1512432,1512471-1512472,1513463,1513472,1514763,1515119,1515237,1515992,1515997,1516023-1516024,1516051-1516052,1516565,1516806,1518184,1520529,1520532,1520539,1522892,1524869,1527103,1527105,1535551,1535591,1537360,1537415,1537555,1537700,1539309,1541705,1541790,1542042,1542069,1542071,1542119,1542129,1542610,1544295,1544316,1545835,1545845,1550691,1550772,1551579,1555403,1557320,1560690,1561237,1563066-1563068,1564215,1564576,1564966,1564969,1565531,1566503,1567492,1567494,1568180,1568349,1568872,1569069,1574868,1577200,1577739,1577755,1580626,1580650,1587968,1588772,1590212,1591123,1594156,1595431,1600909,1615219,1615255-1615256,1636874,1637826,1640730,1640862,1640873,1641564,1643033,1643409,1643437,1643457,1643793,1643810,1643972
+/subversion/trunk/NOTICE:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146762,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,1150344,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,1155
404,1156085,1156098,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,1158923-1158924,1158929,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,1163372,1163383,1163557,1163792,1163953,1164027,1164116,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1164929,1166267,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174342,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1
177732,1178280,1178282,1178942,1179680,1179767,1179776,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,1190463,1195480,1197135,1197998,1199876,1199950,1200277,1200837,1200896,1201002,1201072,1201419,1201824,1202132,1202135,1202187,1202333,1202630,1202807,1203546,1203651,1203653,1203977,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1205968,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210147,1210195,1210913,1211048,1211483,1211859,1211885,121247
6,1212482,1212484,1213331,1213673,1213681,1213690,1213711,1213716,1214139,1215260,1215288,1215374-1215375,1215379,1220740,1220742,1220750,1220861,1221178,1221303,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1227237,1227250,1227352,1227372,1227384-1227385,1227900,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1230714,1230798,1231029,1231944-1231945,1232202,1232207,1232221-1232222,1232267,1232413,1233292,1235264,1235296,1235302,1235736,1236163,1236173,1236283,1236343,1237720,1237779,1238121,1239382,1239596,1239631,1239655,1239747,1240314,1240485,1240619,1240752,1241530,1241553,1241599,1241626,1241713,1241726,1242116,1242537,1242607,1242759,1242770,1242794,1243694,1243840,1243920,1243976,1244303,1244317,1244466,1244551,1245284-1245285,1245711,1245738,1245746,1245764,1245809,1245817,1245929,1245935,1291429,1291446,1291520,1291594,1291680,1291685,1291700,1291704,1291726,1291729,1291797,1291810,1291941,1292090,1292248,1292255,1292260,129
2296,1292322,1292507,1292516,1292768,1292827,1292926,1293229,1293577,1293945,1293972,1293976,1293998,1294134,1294136,1294147,1294236,1294470,1294586,1295007,1295303,1295372,1295418,1296251,1296303,1296369,1296691,1297522,1298343,1300265,1302399,1302417,1302539,1302588,1302591,1302613,1305853,1306111,1306275,1306334,1307177,1309865,1309992,1310378,1310428,1310535,1310594,1311702,1311747,1311935,1325361,1327474,1327490,1327495,1327979,1328002,1328038,1328144,1328267-1328268,1328353,1328846-1328847,1328852,1328878,1329388,1329417,1329876,1330258,1330382,1330444,1330520,1335104,1335555,1337441,1338291,1338297,1338314,1338688,1338708,1338713,1338739,1338748,1338810,1339159,1339164,1340556,1341012,1341031,1341034,1341076,1341544,1341560,1342984,1344864-1344865,1344869,1345482,1345740,1346765,1348822,1349215,1349367,1349371,1349380,1349778,1351117,1351772,1352031,1352068,1353572,1354626,1354652,1354876,1354907,1355340,1361007,1361019,1361341,1362508,1365519,1365549,1365554,1365556,1365592,
1367498,1368065,1368128,1368197-1368198,1371282,1374198,1374800,1374802,1375052,1375089,1376414,1378847,1380175,1380295,1380697,1382843,1383029,1383466,1383483,1383946,1386594,1386601,1387226,1387943,1388975,1389364,1389499,1389658,1389851,1389878,1389928,1390653,1390965,1391020,1391022,1391641,1391935,1392502,1392599,1393061,1393156,1393165,1393542,1393551,1393598,1394519,1396285,1398100,1399174,1401915,1402417,1402421,1403258,1403583,1403588,1403691,1403964,1403982,1404912,1405922,1407131,1407812,1408650,1409146,1409939,1410106,1410203,1413402,1419670-1419681,1421011,1421103,1421380,1421541,1422053,1422100,1423585,1423646,1423837,1423840,1423848,1424977,1425368,1426138,1426264,1426752,1426830,1427197,1427210,1427278,1429201,1434128,1434405,1434414,1434418,1434435,1434476,1434750,1435361,1438602,1438683,1441810,1443763,1443929,1445753,1451678,1452617,1452780,1452967,1453780,1454088,1454217,1455352,1458341,1459599,1461278,1461562,1461580,1461701,1461743,1461760,1462041,1462293,14623
00,1462302,1462321,1462334,1465975,1476359,1477730,1481010,1481627,1482282,1483781,1485350,1490684,1496127,1503528,1507044,1512432,1512471-1512472,1513463,1513472,1514763,1515119,1515237,1515992,1515997,1516023-1516024,1516051-1516052,1516565,1516806,1518184,1520529,1520532,1520539,1522892,1524869,1527103,1527105,1535551,1535591,1537360,1537415,1537555,1537700,1539309,1541705,1541790,1542042,1542069,1542071,1542119,1542129,1542610,1544295,1544316,1545835,1545845,1550691,1550772,1551579,1555403,1557320,1560690,1561237,1563066-1563068,1564215,1564576,1564966,1564969,1565531,1566503,1567492,1567494,1568180,1568349,1568872,1569069,1574868,1577200,1577739,1577755,1580626,1580650,1587968,1588772,1590212,1591123,1594156,1595431,1600909,1615219,1615255-1615256,1636874,1637826,1640730,1640862,1640873,1641564,1643033,1643409,1643437,1643457,1643793,1643810,1643972,1667976
Modified: subversion/branches/1.7.x-issue4340-repos/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/STATUS?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/STATUS (original)
+++ subversion/branches/1.7.x-issue4340-repos/STATUS Tue Jul 28 11:18:37 2015
@@ -10,7 +10,7 @@ See http://subversion.apache.org/docs/co
for details on how release lines and voting work, what kinds of bugs can
delay a release, etc.
-Status of 1.7.20:
+Status of 1.7.22:
Candidate changes:
==================
@@ -27,7 +27,7 @@ Candidate changes:
+0: rhuijben (Shouldn't we provide a three way diff instead of guessing
a base to show a one way diff against based on the
operation?
-
+ .
I would prefer to have show-diff always work against
the local pristine version, instead of sometimes against
their or their-old (src-left) version, as that is the final
@@ -52,7 +52,35 @@ Candidate changes:
-0: danielsh (restrictions not suitable for introduction in patch release;
dev@ thread started 2013/05/10 9pm)
- * r1542765, r1571214
+ * r1654932, r1654933, r1654934, r1654937
+ Fix issue #4554, "0 file length reported in FSFS".
+ Justification:
+ We want 1.7 to cope with repositories that have been touched by 1.8.
+ The issue causes 'svnadmin dump' to create corrupted output that fails
+ to load and we provide no way to detect that problem other than loading
+ the respective dump. We also want to prevent further instances of that
+ issue to be added to the repository.
+ Branch:
+ ^/subversion/branches/1.7.x-issue4554
+ Votes:
+ +1: stefan2, brane
+
+ * r1659867
+ Make editor-aborts after close edit safe.
+ Justification:
+ A SIGPIPE caused by cancelling a commit at the wrong time may cause
+ the commit editor to return an error from editor->close_edit() which
+ makes most code paths call editor->abort_edit(), causing a double
+ free() of the txnroot pool. This branch contains
+ the 1.7.x equivalent of the 1.8.x and trunk patch including a similar
+ fix for ra-neon.
+ Branch:
+ ^/subversion/branches/1.7.x-r1659867
+ Votes:
+ +1: rhuijben, brane
+ +1: danielsh (libsvn_repos part only)
+
+ * r1542765, r1567080, r1571214
Add Sqlite index information.
Justification:
Adding this information explains to Sqlite how we use our indexes. While
@@ -62,16 +90,8 @@ Candidate changes:
Branch:
^/subversion/branches/1.7.x-r1542765
Votes:
- +1: rhuijben
-
- * r1644158, r1644530, r1644595, r1644599
- Fix patch output for reordered hunks, part of issue 4533.
- Justification:
- Output is invalid.
- Branch:
- ^/subversion/branches/1.8.x-r1644595
- Votes:
- +1: philip
+ +1: brane
+ +1: rhuijben, stefan2 (without r1567080)
Veto-blocked changes:
=====================
@@ -88,7 +108,23 @@ Veto-blocked changes:
this is about err->message which is valid in all builds)
-1: stsp (not a bug fix, changes output in a patch release)
- * r1643074
+
+ * r1646230, r1646250, r1646253, r1656893, r1657182, r1657195, r1657401
+ Make svnsync strip any r0 references from mergeinfo -- issue #4476.
+ Justification:
+ Without this is was not possible to svnsync a repository that contained
+ this kind of mergeinfo that is now considered invalid but previously
+ could be committed.
+ Branch:
+ ^/subversion/branches/1.7.x-r1646250
+ Notes:
+ r1643074 (nominated separately) is required for the test to work.
+ I would recommend not backporting r1646250 without r1643074.
+ This is also nominated for 1.8.x.
+ Votes:
+ -1: julianfoad (the test is failing; not essential for 1.7.x)
+
+* r1643074
Don't let invalid mergeinfo stop 'svnadmin load' from working.
Part of issue #4476 "Mergeinfo containing r0 makes svnsync and svnadmin
dump fail".
@@ -102,10 +138,8 @@ Veto-blocked changes:
Branch:
^/subversion/branches/1.7.x-r1643074
Votes:
- +1: julianfoad
- -1: breser (no changes on branch, attempt to merge something for this
- was mismerged on release branch in r1643189, the merge that
- was made broke swig-rb)
+ -1: julianfoad (I think the fix is right but the branch doesn't merge
+ properly with a plain automatic merge)
Approved changes:
=================
Modified: subversion/branches/1.7.x-issue4340-repos/build/ac-macros/apache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/build/ac-macros/apache.m4?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/build/ac-macros/apache.m4 (original)
+++ subversion/branches/1.7.x-issue4340-repos/build/ac-macros/apache.m4 Tue Jul 28 11:18:37 2015
@@ -85,6 +85,20 @@ VERSION_OKAY
AC_MSG_RESULT(no - Unable to locate $APXS_INCLUDE/mod_dav.h)
APXS=""
fi
+ HTTPD="`$APXS -q sbindir`/`$APXS -q PROGNAME`"
+ if ! test -e $HTTPD ; then
+ HTTPD="`$APXS -q bindir`/`$APXS -q PROGNAME`"
+ fi
+ HTTPD_VERSION=["`$HTTPD -v | $SED -e 's@^.*/\([0-9.]*\)\(.*$\)@\1@ ; 1q'`"]
+ AC_ARG_ENABLE(broken-httpd-auth,
+ AS_HELP_STRING([--enable-broken-httpd-auth],
+ [Allow building against httpd 2.4 with broken auth]),
+ [broken_httpd_auth=$enableval],[broken_httpd_auth=no])
+ if test "$enable_broken_httpd_auth" = "yes"; then
+ AC_MSG_NOTICE([Building with broken httpd auth])
+ AC_DEFINE(SVN_ALLOW_BROKEN_HTTPD_AUTH, 1,
+ [Defined to allow building against httpd 2.4 with broken auth])
+ fi
else
AC_MSG_RESULT(no)
fi
@@ -178,6 +192,7 @@ AC_SUBST(APXS)
AC_SUBST(APACHE_LDFLAGS)
AC_SUBST(APACHE_INCLUDES)
AC_SUBST(APACHE_LIBEXECDIR)
+AC_SUBST(HTTPD_VERSION)
# there aren't any flags that interest us ...
#if test -n "$APXS" && test "$APXS" != "no"; then
Modified: subversion/branches/1.7.x-issue4340-repos/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/build/generator/gen_vcnet_vcproj.py?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/branches/1.7.x-issue4340-repos/build/generator/gen_vcnet_vcproj.py Tue Jul 28 11:18:37 2015
@@ -115,6 +115,7 @@ class Generator(gen_win.WinGeneratorBase
'instrument_apr_pools' : self.instrument_apr_pools,
'instrument_purify_quantify' : self.instrument_purify_quantify,
'version' : self.vcproj_version,
+ 'toolset_version' : 'v' + self.vcproj_version.replace('.',''),
}
if self.vcproj_extension == '.vcproj':
@@ -201,6 +202,8 @@ class Generator(gen_win.WinGeneratorBase
for i in range(len(depends)):
if depends[i].fname.startswith(self.projfilesdir):
path = depends[i].fname[len(self.projfilesdir) + 1:]
+ elif os.path.isabs(depends[i].fname):
+ path = depends[i].fname
else:
path = '$(SolutionDir)' + depends[i].fname
deplist.append(gen_win.ProjectItem(guid=guids[depends[i].name],
Modified: subversion/branches/1.7.x-issue4340-repos/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/build/generator/gen_win.py?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/build/generator/gen_win.py (original)
+++ subversion/branches/1.7.x-issue4340-repos/build/generator/gen_win.py Tue Jul 28 11:18:37 2015
@@ -188,6 +188,26 @@ class GeneratorBase(gen_base.GeneratorBa
self.sln_version = '11.00'
self.vcproj_version = '10.0'
self.vcproj_extension = '.vcxproj'
+ elif val == '2010':
+ self.vs_version = '2010'
+ self.sln_version = '11.00'
+ self.vcproj_version = '10.0'
+ self.vcproj_extension = '.vcxproj'
+ elif val == '2012' or val == '11':
+ self.vs_version = '2012'
+ self.sln_version = '12.00'
+ self.vcproj_version = '11.0'
+ self.vcproj_extension = '.vcxproj'
+ elif val == '2013' or val == '12':
+ self.vs_version = '2013'
+ self.sln_version = '12.00'
+ self.vcproj_version = '12.0'
+ self.vcproj_extension = '.vcxproj'
+ elif val == '2015' or val == '14':
+ self.vs_version = '2015'
+ self.sln_version = '12.00'
+ self.vcproj_version = '14.0'
+ self.vcproj_extension = '.vcxproj'
else:
print('WARNING: Unknown VS.NET version "%s",'
' assuming "%s"\n' % (val, '7.00'))
@@ -855,7 +875,7 @@ class WinGeneratorBase(GeneratorBase):
if target.name == 'mod_dav_svn':
fakedefines.extend(["AP_DECLARE_EXPORT"])
- if target.name.find('ruby') == -1:
+ if target.name.find('ruby') == -1 and float(self.vcproj_version) < 14.0:
fakedefines.append("snprintf=_snprintf")
if isinstance(target, gen_base.TargetSWIG):
@@ -1253,7 +1273,8 @@ class WinGeneratorBase(GeneratorBase):
data = {
'version' : self.vcproj_version,
'configs' : self.configs,
- 'platforms' : self.platforms
+ 'platforms' : self.platforms,
+ 'toolset_version' : 'v' + self.vcproj_version.replace('.',''),
}
for key, val in params:
data[key] = val
Modified: subversion/branches/1.7.x-issue4340-repos/build/generator/templates/svn_config.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/build/generator/templates/svn_config.vcxproj.ezt?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/build/generator/templates/svn_config.vcxproj.ezt (original)
+++ subversion/branches/1.7.x-issue4340-repos/build/generator/templates/svn_config.vcxproj.ezt Tue Jul 28 11:18:37 2015
@@ -33,6 +33,7 @@
[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
+ <PlatformToolset>[toolset_version]</PlatformToolset>
</PropertyGroup>
[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: subversion/branches/1.7.x-issue4340-repos/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/build/generator/templates/vcnet_vcxproj.ezt?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/branches/1.7.x-issue4340-repos/build/generator/templates/vcnet_vcxproj.ezt Tue Jul 28 11:18:37 2015
@@ -33,6 +33,7 @@
[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'" Label="Configuration">
<ConfigurationType>[config_type]</ConfigurationType>
<UseDebugLibraries>[is configs.name "Debug"]true[else]false[end]</UseDebugLibraries>
+ <PlatformToolset>[toolset_version]</PlatformToolset>
</PropertyGroup>
[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: subversion/branches/1.7.x-issue4340-repos/build/generator/templates/zlib.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/build/generator/templates/zlib.vcxproj.ezt?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/build/generator/templates/zlib.vcxproj.ezt (original)
+++ subversion/branches/1.7.x-issue4340-repos/build/generator/templates/zlib.vcxproj.ezt Tue Jul 28 11:18:37 2015
@@ -33,6 +33,7 @@
[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
+ <PlatformToolset>[toolset_version]</PlatformToolset>
</PropertyGroup>
[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: subversion/branches/1.7.x-issue4340-repos/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/build/run_tests.py?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/build/run_tests.py (original)
+++ subversion/branches/1.7.x-issue4340-repos/build/run_tests.py Tue Jul 28 11:18:37 2015
@@ -29,6 +29,7 @@
[--fs-type=<fs-type>] [--fsfs-packing] [--fsfs-sharding=<n>]
[--list] [--milestone-filter=<regex>] [--mode-filter=<type>]
[--server-minor-version=<version>]
+ [--httpd-version=<version>]
[--config-file=<file>]
<abs_srcdir> <abs_builddir>
<prog ...>
@@ -81,7 +82,7 @@ class TestHarness:
cleanup=None, enable_sasl=None, parallel=None, config_file=None,
fsfs_sharding=None, fsfs_packing=None,
list_tests=None, svn_bin=None, mode_filter=None,
- milestone_filter=None):
+ milestone_filter=None, httpd_version=None):
'''Construct a TestHarness instance.
ABS_SRCDIR and ABS_BUILDDIR are the source and build directories.
@@ -130,6 +131,7 @@ class TestHarness:
self.svn_bin = svn_bin
self.mode_filter = mode_filter
self.log = None
+ self.httpd_version = httpd_version
if not sys.stdout.isatty() or sys.platform == 'win32':
TextColors.disable()
@@ -414,6 +416,8 @@ class TestHarness:
svntest.main.options.fsfs_packing = self.fsfs_packing
if self.mode_filter is not None:
svntest.main.options.mode_filter = self.mode_filter
+ if self.httpd_version is not None:
+ svntest.main.options.httpd_version = self.httpd_version
svntest.main.options.srcdir = self.srcdir
@@ -562,7 +566,7 @@ def main():
'fsfs-packing', 'fsfs-sharding=',
'enable-sasl', 'parallel', 'config-file=',
'log-to-stdout', 'list', 'milestone-filter=',
- 'mode-filter='])
+ 'mode-filter=', 'httpd-version='])
except getopt.GetoptError:
args = []
@@ -572,9 +576,10 @@ def main():
base_url, fs_type, verbose, cleanup, enable_sasl, http_library, \
server_minor_version, fsfs_sharding, fsfs_packing, parallel, \
- config_file, log_to_stdout, list_tests, mode_filter, milestone_filter= \
+ config_file, log_to_stdout, list_tests, mode_filter, milestone_filter, \
+ httpd_version = \
None, None, None, None, None, None, None, None, None, None, None, \
- None, None, None, None
+ None, None, None, None, None
for opt, val in opts:
if opt in ['-u', '--url']:
base_url = val
@@ -606,6 +611,8 @@ def main():
milestone_filter = val
elif opt in ['--mode-filter']:
mode_filter = val
+ elif opt in ['--httpd-version']:
+ httpd_version = val
else:
raise getopt.GetoptError
@@ -620,7 +627,8 @@ def main():
base_url, fs_type, http_library, server_minor_version,
verbose, cleanup, enable_sasl, parallel, config_file,
fsfs_sharding, fsfs_packing, list_tests,
- mode_filter=mode_filter, milestone_filter=milestone_filter)
+ mode_filter=mode_filter, milestone_filter=milestone_filter,
+ httpd_version=httpd_version)
failed = th.run(args[2:])
if failed:
Modified: subversion/branches/1.7.x-issue4340-repos/gen-make.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/gen-make.py?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/gen-make.py (original)
+++ subversion/branches/1.7.x-issue4340-repos/gen-make.py Tue Jul 28 11:18:37 2015
@@ -211,8 +211,8 @@ def _usage_exit(err=None):
print(" Use static apr and apr-util")
print("")
print(" --vsnet-version=VER")
- print(" generate for VS.NET version VER (2002, 2003, 2005, 2008 or 2010)")
- print(" [only valid in combination with '-t vcproj']")
+ print(" generate for VS.NET version VER (2002, 2003, 2005, 2008, 2010,")
+ print(" 2012, 2013 or 2015) [only valid in combination with '-t vcproj']")
print("")
print(" --with-apr_memcache=DIR")
print(" the apr_memcache sources are in DIR")
Modified: subversion/branches/1.7.x-issue4340-repos/subversion/bindings/swig/include/apr.swg
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/subversion/bindings/swig/include/apr.swg?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/subversion/bindings/swig/include/apr.swg (original)
+++ subversion/branches/1.7.x-issue4340-repos/subversion/bindings/swig/include/apr.swg Tue Jul 28 11:18:37 2015
@@ -31,23 +31,21 @@
*/
#ifdef SWIGPERL
%typemap(out) long long {
- char temp[256];
+ char temp[30];
sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) $1);
- ST(argvi) = sv_newmortal();
- sv_setpv((SV*)ST(argvi++), temp);
+ %append_output(sv_2mortal(newSVpv(temp, 0)));
}
%typemap(out) unsigned long long {
- char temp[256];
+ char temp[30];
sprintf(temp, "%" APR_UINT64_T_FMT, (apr_uint64_t) $1);
- ST(argvi) = sv_newmortal();
- sv_setpv((SV*)ST(argvi++), temp);
+ %append_output(sv_2mortal(newSVpv(temp, 0)));
}
%typemap(in, numinputs=0) long long *OUTPUT (apr_int64_t temp)
"$1 = &temp;";
%typemap(argout) long long *OUTPUT {
- char temp[256];
+ char temp[30];
sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t)*($1));
%append_output(sv_2mortal(newSVpv(temp, 0)));
}
@@ -55,7 +53,7 @@
%typemap(in, numinputs=0) unsigned long long *OUTPUT (apr_uint64_t temp)
"$1 = &temp;";
%typemap(argout) unsigned long long *OUTPUT {
- char temp[256];
+ char temp[30];
sprintf(temp, "%" APR_UINT64_T_FMT, (apr_uint64_t)*($1));
%append_output(sv_2mortal(newSVpv(temp, 0)));
}
Modified: subversion/branches/1.7.x-issue4340-repos/subversion/bindings/swig/include/svn_types.swg
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/subversion/bindings/swig/include/svn_types.swg?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/subversion/bindings/swig/include/svn_types.swg (original)
+++ subversion/branches/1.7.x-issue4340-repos/subversion/bindings/swig/include/svn_types.swg Tue Jul 28 11:18:37 2015
@@ -1102,11 +1102,7 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE se
}
%typemap(argout) unsigned char *result_digest {
- /* FIXME: This code is clearly buggy. The return value of sv_newmortal()
- is immediately overwritten by the return value
- of svn_swig_pl_from_md5(). */
- ST(argvi) = sv_newmortal();
- ST(argvi++) = svn_swig_pl_from_md5($1);
+ %append_output(svn_swig_pl_from_md5($1));
}
#endif
Modified: subversion/branches/1.7.x-issue4340-repos/subversion/include/svn_version.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/subversion/include/svn_version.h?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/subversion/include/svn_version.h (original)
+++ subversion/branches/1.7.x-issue4340-repos/subversion/include/svn_version.h Tue Jul 28 11:18:37 2015
@@ -71,7 +71,7 @@ extern "C" {
*
* @since New in 1.1.
*/
-#define SVN_VER_PATCH 20
+#define SVN_VER_PATCH 22
/** @deprecated Provided for backward compatibility with the 1.0 API. */
Modified: subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_client/copy.c?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_client/copy.c (original)
+++ subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_client/copy.c Tue Jul 28 11:18:37 2015
@@ -992,7 +992,10 @@ repos_to_repos_copy(const apr_array_head
pair->src_abspath_or_url, pool) != NULL))
{
info->resurrection = TRUE;
- top_url = svn_uri_dirname(top_url, pool);
+ top_url = svn_uri_get_longest_ancestor(
+ top_url,
+ svn_uri_dirname(pair->dst_abspath_or_url, pool),
+ pool);
SVN_ERR(svn_ra_reparent(ra_session, top_url, pool));
}
}
Modified: subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_client/patch.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_client/patch.c?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_client/patch.c (original)
+++ subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_client/patch.c Tue Jul 28 11:18:37 2015
@@ -1858,6 +1858,56 @@ send_patch_notification(const patch_targ
return SVN_NO_ERROR;
}
+static void
+svn_sort__array(apr_array_header_t *array,
+ int (*comparison_func)(const void *,
+ const void *))
+{
+ qsort(array->elts, array->nelts, array->elt_size, comparison_func);
+}
+
+/* Implements the callback for svn_sort__array. Puts hunks that match
+ before hunks that do not match, puts hunks that match in order
+ based on postion matched, puts hunks that do not match in order
+ based on original position. */
+static int
+sort_matched_hunks(const void *a, const void *b)
+{
+ const hunk_info_t *item1 = *((const hunk_info_t * const *)a);
+ const hunk_info_t *item2 = *((const hunk_info_t * const *)b);
+ svn_boolean_t matched1 = !item1->rejected && !item1->already_applied;
+ svn_boolean_t matched2 = !item2->rejected && !item2->already_applied;
+ svn_linenum_t original1, original2;
+
+ if (matched1 && matched2)
+ {
+ /* Both match so use order matched in file. */
+ if (item1->matched_line > item2->matched_line)
+ return 1;
+ else if (item1->matched_line == item2->matched_line)
+ return 0;
+ else
+ return -1;
+ }
+ else if (matched2)
+ /* Only second matches, put it before first. */
+ return 1;
+ else if (matched1)
+ /* Only first matches, put it before second. */
+ return -1;
+
+ /* Neither matches, sort by original_start. */
+ original1 = svn_diff_hunk_get_original_start(item1->hunk);
+ original2 = svn_diff_hunk_get_original_start(item2->hunk);
+ if (original1 > original2)
+ return 1;
+ else if (original1 == original2)
+ return 0;
+ else
+ return -1;
+}
+
+
/* Apply a PATCH to a working copy at ABS_WC_PATH and put the result
* into temporary files, to be installed in the working copy later.
* Return information about the patch target in *PATCH_TARGET, allocated
@@ -1939,6 +1989,10 @@ apply_one_patch(patch_target_t **patch_t
APR_ARRAY_PUSH(target->content->hunks, hunk_info_t *) = hi;
}
+ /* Hunks are applied in the order determined by the matched line and
+ this may be different from the order of the original lines. */
+ svn_sort__array(target->content->hunks, sort_matched_hunks);
+
/* Apply or reject hunks. */
for (i = 0; i < target->content->hunks->nelts; i++)
{
Modified: subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_fs_fs/fs_fs.c?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_fs_fs/fs_fs.c Tue Jul 28 11:18:37 2015
@@ -6958,10 +6958,13 @@ recover_find_max_ids(svn_fs_t *fs, svn_r
"representation"));
/* Now create a stream that's allowed to read only as much data as is
- stored in the representation. */
+ stored in the representation. Note that this is a directory, i.e.
+ represented using the hash format on disk and can never have 0 length. */
baton.file = rev_file;
baton.pool = pool;
- baton.remaining = data_rep->expanded_size;
+ baton.remaining = data_rep->expanded_size
+ ? data_rep->expanded_size
+ : data_rep->size;
stream = svn_stream_create(&baton, pool);
svn_stream_set_read(stream, read_handler_recover);
Modified: subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_repos/rev_hunt.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_repos/rev_hunt.c?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_repos/rev_hunt.c (original)
+++ subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_repos/rev_hunt.c Tue Jul 28 11:18:37 2015
@@ -721,23 +721,6 @@ svn_repos_trace_node_locations(svn_fs_t
if (! prev_path)
break;
- if (authz_read_func)
- {
- svn_boolean_t readable;
- svn_fs_root_t *tmp_root;
-
- SVN_ERR(svn_fs_revision_root(&tmp_root, fs, revision, currpool));
- SVN_ERR(authz_read_func(&readable, tmp_root, path,
- authz_read_baton, currpool));
- if (! readable)
- {
- svn_pool_destroy(lastpool);
- svn_pool_destroy(currpool);
-
- return SVN_NO_ERROR;
- }
- }
-
/* Assign the current path to all younger revisions until we reach
the copy target rev. */
while ((revision_ptr < revision_ptr_end)
@@ -760,6 +743,20 @@ svn_repos_trace_node_locations(svn_fs_t
path = prev_path;
revision = prev_rev;
+ if (authz_read_func)
+ {
+ svn_boolean_t readable;
+ SVN_ERR(svn_fs_revision_root(&root, fs, revision, currpool));
+ SVN_ERR(authz_read_func(&readable, root, path,
+ authz_read_baton, currpool));
+ if (!readable)
+ {
+ svn_pool_destroy(lastpool);
+ svn_pool_destroy(currpool);
+ return SVN_NO_ERROR;
+ }
+ }
+
/* Clear last pool and switch. */
svn_pool_clear(lastpool);
tmppool = lastpool;
Modified: subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/config.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/config.c?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/config.c (original)
+++ subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/config.c Tue Jul 28 11:18:37 2015
@@ -447,14 +447,15 @@ make_string_from_option(const char **val
expand_option_value(cfg, section, opt->value, &opt->x_value, tmp_pool);
opt->expanded = TRUE;
- if (!x_pool)
+ if (x_pool != cfg->x_pool)
{
/* Grab the fully expanded value from tmp_pool before its
disappearing act. */
if (opt->x_value)
opt->x_value = apr_pstrmemdup(cfg->x_pool, opt->x_value,
strlen(opt->x_value));
- svn_pool_destroy(tmp_pool);
+ if (!x_pool)
+ svn_pool_destroy(tmp_pool);
}
}
Modified: subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/error.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/error.c?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/error.c (original)
+++ subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/error.c Tue Jul 28 11:18:37 2015
@@ -249,6 +249,8 @@ svn_error_compose(svn_error_t *chain, sv
*chain = *new_err;
if (chain->message)
chain->message = apr_pstrdup(pool, new_err->message);
+ if (chain->file)
+ chain->file = apr_pstrdup(pool, new_err->file);
chain->pool = pool;
#if defined(SVN_DEBUG)
if (! new_err->child)
@@ -318,6 +320,8 @@ svn_error_dup(svn_error_t *err)
tmp_err->pool = pool;
if (tmp_err->message)
tmp_err->message = apr_pstrdup(pool, tmp_err->message);
+ if (tmp_err->file)
+ tmp_err->file = apr_pstrdup(pool, tmp_err->file);
}
#if defined(SVN_DEBUG)
Modified: subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/opt.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/opt.c?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/opt.c (original)
+++ subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/opt.c Tue Jul 28 11:18:37 2015
@@ -1088,7 +1088,7 @@ svn_opt__print_version_info(const char *
" compiled %s, %s\n\n"), pgm_name,
SVN_VERSION, __DATE__, __TIME__));
SVN_ERR(svn_cmdline_fputs(
- _("Copyright (C) 2014 The Apache Software Foundation.\n"
+ _("Copyright (C) 2015 The Apache Software Foundation.\n"
"This software consists of contributions made by many "
"people; see the NOTICE\n"
"file for more information.\n"
Modified: subversion/branches/1.7.x-issue4340-repos/subversion/mod_authz_svn/mod_authz_svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/subversion/mod_authz_svn/mod_authz_svn.c?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/subversion/mod_authz_svn/mod_authz_svn.c (original)
+++ subversion/branches/1.7.x-issue4340-repos/subversion/mod_authz_svn/mod_authz_svn.c Tue Jul 28 11:18:37 2015
@@ -48,6 +48,23 @@
#include "svn_dirent_uri.h"
#include "private/svn_fspath.h"
+/* The apache headers define these and they conflict with our definitions. */
+#ifdef PACKAGE_BUGREPORT
+#undef PACKAGE_BUGREPORT
+#endif
+#ifdef PACKAGE_NAME
+#undef PACKAGE_NAME
+#endif
+#ifdef PACKAGE_STRING
+#undef PACKAGE_STRING
+#endif
+#ifdef PACKAGE_TARNAME
+#undef PACKAGE_TARNAME
+#endif
+#ifdef PACKAGE_VERSION
+#undef PACKAGE_VERSION
+#endif
+#include "svn_private_config.h"
extern module AP_MODULE_DECLARE_DATA authz_svn_module;
@@ -65,6 +82,30 @@ typedef struct authz_svn_config_rec {
const char *force_username_case;
} authz_svn_config_rec;
+#if AP_MODULE_MAGIC_AT_LEAST(20060110,0) /* version where
+ ap_some_auth_required breaks */
+# if AP_MODULE_MAGIC_AT_LEAST(20120211,47) /* first version with
+ force_authn hook and
+ ap_some_authn_required() which
+ allows us to work without
+ ap_some_auth_required() */
+# define USE_FORCE_AUTHN 1
+# define IN_SOME_AUTHN_NOTE "authz_svn-in-some-authn"
+# define FORCE_AUTHN_NOTE "authz_svn-force-authn"
+# else
+ /* ap_some_auth_required() is busted and no viable alternative exists */
+# ifndef SVN_ALLOW_BROKEN_HTTPD_AUTH
+# error This version of httpd has a security hole with mod_authz_svn
+# else
+ /* user wants to build anyway */
+# define USE_FORCE_AUTHN 0
+# endif
+# endif
+#else
+ /* old enough that ap_some_auth_required() still works */
+# define USE_FORCE_AUTHN 0
+#endif
+
/*
* Configuration
*/
@@ -682,7 +723,49 @@ access_checker(request_rec *r)
&authz_svn_module);
const char *repos_path = NULL;
const char *dest_repos_path = NULL;
- int status;
+ int status, authn_required;
+
+#if USE_FORCE_AUTHN
+ /* Use the force_authn() hook available in 2.4.x to work securely
+ * given that ap_some_auth_required() is no longer functional for our
+ * purposes in 2.4.x.
+ */
+ int authn_configured;
+
+ /* We are not configured to run */
+ if (!conf->anonymous || apr_table_get(r->notes, IN_SOME_AUTHN_NOTE)
+ || (! (conf->access_file || conf->repo_relative_access_file)))
+ return DECLINED;
+
+ /* Authentication is configured */
+ authn_configured = ap_auth_type(r) != NULL;
+ if (authn_configured)
+ {
+ /* If the user is trying to authenticate, let him. It doesn't
+ * make much sense to grant anonymous access but deny authenticated
+ * users access, even though you can do that with '$anon' in the
+ * access file.
+ */
+ if (apr_table_get(r->headers_in,
+ (PROXYREQ_PROXY == r->proxyreq)
+ ? "Proxy-Authorization" : "Authorization"))
+ {
+ /* Set the note to force authn regardless of what access_checker_ex
+ hook requires */
+ apr_table_setn(r->notes, FORCE_AUTHN_NOTE, (const char*)1);
+
+ /* provide the proper return so the access_checker hook doesn't
+ * prevent the code from continuing on to the other auth hooks */
+ if (ap_satisfies(r) != SATISFY_ANY)
+ return OK;
+ else
+ return HTTP_FORBIDDEN;
+ }
+ }
+
+#else
+ /* Support for older versions of httpd that have a working
+ * ap_some_auth_required() */
/* We are not configured to run */
if (!conf->anonymous
@@ -697,9 +780,10 @@ access_checker(request_rec *r)
if (ap_satisfies(r) != SATISFY_ANY)
return DECLINED;
- /* If the user is trying to authenticate, let him. If anonymous
- * access is allowed, so is authenticated access, by definition
- * of the meaning of '*' in the access file.
+ /* If the user is trying to authenticate, let him. It doesn't
+ * make much sense to grant anonymous access but deny authenticated
+ * users access, even though you can do that with '$anon' in the
+ * access file.
*/
if (apr_table_get(r->headers_in,
(PROXYREQ_PROXY == r->proxyreq)
@@ -711,6 +795,7 @@ access_checker(request_rec *r)
return HTTP_FORBIDDEN;
}
}
+#endif
/* If anon access is allowed, return OK */
status = req_check_access(r, conf, &repos_path, &dest_repos_path);
@@ -719,7 +804,26 @@ access_checker(request_rec *r)
if (!conf->authoritative)
return DECLINED;
+#if USE_FORCE_AUTHN
+ if (authn_configured) {
+ /* We have to check to see if authn is required because if so we must
+ * return UNAUTHORIZED (401) rather than FORBIDDEN (403) since returning
+ * the 403 leaks information about what paths may exist to
+ * unauthenticated users. We must set a note here in order
+ * to use ap_some_authn_rquired() without triggering an infinite
+ * loop since the call will trigger this function to be called again. */
+ apr_table_setn(r->notes, IN_SOME_AUTHN_NOTE, (const char*)1);
+ authn_required = ap_some_authn_required(r);
+ apr_table_unset(r->notes, IN_SOME_AUTHN_NOTE);
+ if (authn_required)
+ {
+ ap_note_auth_failure(r);
+ return HTTP_UNAUTHORIZED;
+ }
+ }
+#else
if (!ap_some_auth_required(r))
+#endif
log_access_verdict(APLOG_MARK, r, 0, repos_path, dest_repos_path);
return HTTP_FORBIDDEN;
@@ -800,6 +904,17 @@ auth_checker(request_rec *r)
return OK;
}
+#if USE_FORCE_AUTHN
+static int
+force_authn(request_rec *r)
+{
+ if (apr_table_get(r->notes, FORCE_AUTHN_NOTE))
+ return OK;
+
+ return DECLINED;
+}
+#endif
+
/*
* Module flesh
*/
@@ -816,6 +931,9 @@ register_hooks(apr_pool_t *p)
* give SSLOptions +FakeBasicAuth a chance to work. */
ap_hook_check_user_id(check_user_id, mod_ssl, NULL, APR_HOOK_FIRST);
ap_hook_auth_checker(auth_checker, NULL, NULL, APR_HOOK_FIRST);
+#if USE_FORCE_AUTHN
+ ap_hook_force_authn(force_authn, NULL, NULL, APR_HOOK_FIRST);
+#endif
ap_register_provider(p,
AUTHZ_SVN__SUBREQ_BYPASS_PROV_GRP,
AUTHZ_SVN__SUBREQ_BYPASS_PROV_NAME,
Modified: subversion/branches/1.7.x-issue4340-repos/subversion/mod_dav_svn/deadprops.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/subversion/mod_dav_svn/deadprops.c?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/subversion/mod_dav_svn/deadprops.c (original)
+++ subversion/branches/1.7.x-issue4340-repos/subversion/mod_dav_svn/deadprops.c Tue Jul 28 11:18:37 2015
@@ -160,6 +160,23 @@ get_value(dav_db *db, const dav_prop_nam
}
+static svn_error_t *
+change_txn_prop(svn_fs_txn_t *txn,
+ const char *propname,
+ const svn_string_t *value,
+ apr_pool_t *scratch_pool)
+{
+ if (strcmp(propname, SVN_PROP_REVISION_AUTHOR) == 0)
+ return svn_error_create(SVN_ERR_RA_DAV_REQUEST_FAILED, NULL,
+ "Attempted to modify 'svn:author' property "
+ "on a transaction");
+
+ SVN_ERR(svn_repos_fs_change_txn_prop(txn, propname, value, scratch_pool));
+
+ return SVN_NO_ERROR;
+}
+
+
static dav_error *
save_value(dav_db *db, const dav_prop_name *name,
const svn_string_t *const *old_value_p,
@@ -210,9 +227,8 @@ save_value(dav_db *db, const dav_prop_na
{
if (db->resource->working)
{
- serr = svn_repos_fs_change_txn_prop(resource->info->root.txn,
- propname, value,
- subpool);
+ serr = change_txn_prop(resource->info->root.txn, propname,
+ value, subpool);
}
else
{
@@ -251,8 +267,8 @@ save_value(dav_db *db, const dav_prop_na
}
else if (resource->info->restype == DAV_SVN_RESTYPE_TXN_COLLECTION)
{
- serr = svn_repos_fs_change_txn_prop(resource->info->root.txn,
- propname, value, subpool);
+ serr = change_txn_prop(resource->info->root.txn, propname,
+ value, subpool);
}
else
{
@@ -561,8 +577,8 @@ db_remove(dav_db *db, const dav_prop_nam
/* Working Baseline or Working (Version) Resource */
if (db->resource->baselined)
if (db->resource->working)
- serr = svn_repos_fs_change_txn_prop(db->resource->info->root.txn,
- propname, NULL, subpool);
+ serr = change_txn_prop(db->resource->info->root.txn, propname,
+ NULL, subpool);
else
/* ### VIOLATING deltaV: you can't proppatch a baseline, it's
not a working resource! But this is how we currently
Modified: subversion/branches/1.7.x-issue4340-repos/subversion/mod_dav_svn/reports/get-location-segments.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/subversion/mod_dav_svn/reports/get-location-segments.c?rev=1693068&r1=1693067&r2=1693068&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/subversion/mod_dav_svn/reports/get-location-segments.c (original)
+++ subversion/branches/1.7.x-issue4340-repos/subversion/mod_dav_svn/reports/get-location-segments.c Tue Jul 28 11:18:37 2015
@@ -181,17 +181,36 @@ dav_svn__get_location_segments_report(co
"Not all parameters passed.",
SVN_DAV_ERROR_NAMESPACE,
SVN_DAV_ERROR_TAG);
- if (SVN_IS_VALID_REVNUM(start_rev)
- && SVN_IS_VALID_REVNUM(end_rev)
- && (end_rev > start_rev))
+
+ /* No START_REV or PEG_REVISION? We'll use HEAD. */
+ if (!SVN_IS_VALID_REVNUM(start_rev) || !SVN_IS_VALID_REVNUM(peg_revision))
+ {
+ svn_revnum_t youngest;
+
+ serr = svn_fs_youngest_rev(&youngest, resource->info->repos->fs,
+ resource->pool);
+ if (serr != NULL)
+ return dav_svn__convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
+ "Could not determine youngest revision",
+ resource->pool);
+
+ if (!SVN_IS_VALID_REVNUM(start_rev))
+ start_rev = youngest;
+ if (!SVN_IS_VALID_REVNUM(peg_revision))
+ peg_revision = youngest;
+ }
+
+ /* No END_REV? We'll use 0. */
+ if (!SVN_IS_VALID_REVNUM(end_rev))
+ end_rev = 0;
+
+ if (end_rev > start_rev)
return dav_svn__new_error_tag(resource->pool, HTTP_BAD_REQUEST, 0,
"End revision must not be younger than "
"start revision",
SVN_DAV_ERROR_NAMESPACE,
SVN_DAV_ERROR_TAG);
- if (SVN_IS_VALID_REVNUM(peg_revision)
- && SVN_IS_VALID_REVNUM(start_rev)
- && (start_rev > peg_revision))
+ if (start_rev > peg_revision)
return dav_svn__new_error_tag(resource->pool, HTTP_BAD_REQUEST, 0,
"Start revision must not be younger than "
"peg revision",