You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2014/12/14 12:44:04 UTC
svn commit: r1645439 [1/8] - in /subversion/branches/1.7.x-issue4340-repos:
./ build/ac-macros/ build/generator/ build/generator/templates/
contrib/hook-scripts/ subversion/bindings/javahl/native/
subversion/bindings/javahl/src/org/apache/subversion/ja...
Author: stsp
Date: Sun Dec 14 11:44:03 2014
New Revision: 1645439
URL: http://svn.apache.org/r1645439
Log:
Sync the 1.7.x-issue4340-repos branch with 1.7.x.
Added:
subversion/branches/1.7.x-issue4340-repos/subversion/include/private/svn_cert.h
- copied unchanged from r1645438, subversion/branches/1.7.x/subversion/include/private/svn_cert.h
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_client/diff_summarize.c
- copied unchanged from r1645438, subversion/branches/1.7.x/subversion/libsvn_client/diff_summarize.c
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/NOTICE (contents, props changed)
subversion/branches/1.7.x-issue4340-repos/STATUS
subversion/branches/1.7.x-issue4340-repos/autogen.sh
subversion/branches/1.7.x-issue4340-repos/build.conf
subversion/branches/1.7.x-issue4340-repos/build/ac-macros/apache.m4
subversion/branches/1.7.x-issue4340-repos/build/ac-macros/berkeley-db.m4
subversion/branches/1.7.x-issue4340-repos/build/ac-macros/gssapi.m4
subversion/branches/1.7.x-issue4340-repos/build/ac-macros/serf.m4
subversion/branches/1.7.x-issue4340-repos/build/generator/gen_win.py
subversion/branches/1.7.x-issue4340-repos/build/generator/templates/build_zlib.ezt
subversion/branches/1.7.x-issue4340-repos/build/generator/templates/vcnet_vcproj.ezt
subversion/branches/1.7.x-issue4340-repos/configure.ac
subversion/branches/1.7.x-issue4340-repos/contrib/hook-scripts/check-mime-type.pl
subversion/branches/1.7.x-issue4340-repos/contrib/hook-scripts/svn-keyword-check.pl
subversion/branches/1.7.x-issue4340-repos/get-deps.sh
subversion/branches/1.7.x-issue4340-repos/subversion/bindings/javahl/native/ClientContext.cpp
subversion/branches/1.7.x-issue4340-repos/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/branches/1.7.x-issue4340-repos/subversion/bindings/javahl/native/JNIUtil.h
subversion/branches/1.7.x-issue4340-repos/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/1.7.x-issue4340-repos/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/LogDate.java
subversion/branches/1.7.x-issue4340-repos/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java
subversion/branches/1.7.x-issue4340-repos/subversion/bindings/swig/include/svn_types.swg
subversion/branches/1.7.x-issue4340-repos/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
subversion/branches/1.7.x-issue4340-repos/subversion/include/private/svn_adler32.h (props changed)
subversion/branches/1.7.x-issue4340-repos/subversion/include/private/svn_string_private.h (props changed)
subversion/branches/1.7.x-issue4340-repos/subversion/include/private/svn_temp_serializer.h (props changed)
subversion/branches/1.7.x-issue4340-repos/subversion/include/svn_io.h
subversion/branches/1.7.x-issue4340-repos/subversion/include/svn_types.h
subversion/branches/1.7.x-issue4340-repos/subversion/include/svn_version.h
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_client/blame.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_client/client.h
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_client/copy.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_client/delete.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_client/diff.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_client/externals.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_client/merge.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_client/repos_diff_summarize.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_client/status.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_client/update.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_delta/svndiff.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_diff/diff_file.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_fs/fs-loader.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_fs_fs/temp_serializer.c (props changed)
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_fs_fs/temp_serializer.h (props changed)
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_fs_fs/tree.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_ra_local/split_url.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_ra_neon/log.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_ra_serf/log.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_ra_serf/util.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_ra_svn/cyrus_auth.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_repos/dump.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_repos/reporter.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/adler32.c (props changed)
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/cmdline.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/config_auth.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/dirent_uri.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/hash.c (props changed)
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/io.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/nls.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/opt.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/subst.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/svn_base64.c (props changed)
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/svn_cache_config.c (contents, props changed)
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_subr/svn_temp_serializer.c (props changed)
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_wc/adm_ops.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_wc/diff_editor.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_wc/diff_local.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_wc/old-and-busted.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_wc/update_editor.c
subversion/branches/1.7.x-issue4340-repos/subversion/libsvn_wc/wc_db.c
subversion/branches/1.7.x-issue4340-repos/subversion/mod_dav_svn/dav_svn.h
subversion/branches/1.7.x-issue4340-repos/subversion/mod_dav_svn/mod_dav_svn.c
subversion/branches/1.7.x-issue4340-repos/subversion/mod_dav_svn/reports/deleted-rev.c
subversion/branches/1.7.x-issue4340-repos/subversion/mod_dav_svn/reports/file-revs.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/mod_dav_svn/reports/get-locations.c
subversion/branches/1.7.x-issue4340-repos/subversion/mod_dav_svn/reports/log.c
subversion/branches/1.7.x-issue4340-repos/subversion/mod_dav_svn/reports/mergeinfo.c
subversion/branches/1.7.x-issue4340-repos/subversion/mod_dav_svn/repos.c
subversion/branches/1.7.x-issue4340-repos/subversion/mod_dav_svn/util.c
subversion/branches/1.7.x-issue4340-repos/subversion/mod_dav_svn/version.c
subversion/branches/1.7.x-issue4340-repos/subversion/po/zh_CN.po
subversion/branches/1.7.x-issue4340-repos/subversion/svn/main.c (contents, props changed)
subversion/branches/1.7.x-issue4340-repos/subversion/svnserve/cyrus_auth.c
subversion/branches/1.7.x-issue4340-repos/subversion/svnserve/main.c (contents, props changed)
subversion/branches/1.7.x-issue4340-repos/subversion/tests/cmdline/basic_tests.py (props changed)
subversion/branches/1.7.x-issue4340-repos/subversion/tests/cmdline/blame_tests.py
subversion/branches/1.7.x-issue4340-repos/subversion/tests/cmdline/checkout_tests.py
subversion/branches/1.7.x-issue4340-repos/subversion/tests/cmdline/commit_tests.py
subversion/branches/1.7.x-issue4340-repos/subversion/tests/cmdline/diff_tests.py
subversion/branches/1.7.x-issue4340-repos/subversion/tests/cmdline/externals_tests.py
subversion/branches/1.7.x-issue4340-repos/subversion/tests/cmdline/log_tests.py
subversion/branches/1.7.x-issue4340-repos/subversion/tests/cmdline/merge_tests.py
subversion/branches/1.7.x-issue4340-repos/subversion/tests/cmdline/revert_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/upgrade_tests.py
subversion/branches/1.7.x-issue4340-repos/subversion/tests/libsvn_diff/diff-diff3-test.c
subversion/branches/1.7.x-issue4340-repos/subversion/tests/libsvn_fs/fs-test.c
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/dirent_uri-test.c
subversion/branches/1.7.x-issue4340-repos/tools/client-side/svnmucc/svnmucc.c (props changed)
subversion/branches/1.7.x-issue4340-repos/tools/server-side/mod_dontdothat/mod_dontdothat.c (contents, props changed)
Propchange: subversion/branches/1.7.x-issue4340-repos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 14 11:44:03 2014
@@ -1,6 +1,11 @@
/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-JavaHL-pools:1158684-1158722
+/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
+/subversion/branches/1.7.x-gssapi-solaris10:1453164-1515067
/subversion/branches/1.7.x-issue3888:1148937-1149162
/subversion/branches/1.7.x-issue3975:1160761-1161546
/subversion/branches/1.7.x-issue3976:1161731-1165397
@@ -13,14 +18,25 @@
/subversion/branches/1.7.x-issue4102:1292401-1295402
/subversion/branches/1.7.x-issue4123:1293358-1293812
/subversion/branches/1.7.x-issue4144:1305854-1306143
+/subversion/branches/1.7.x-issue4153:1309894-1539233
/subversion/branches/1.7.x-issue4161:1330697-1331209
/subversion/branches/1.7.x-issue4166:1330474-1336071
/subversion/branches/1.7.x-issue4169:1330537-1336116
/subversion/branches/1.7.x-issue4257:1454456-1461404
/subversion/branches/1.7.x-issue4263:1423588-1434547
+/subversion/branches/1.7.x-issue4270:1433737-1485341
+/subversion/branches/1.7.x-issue4306:1438872-1514941
/subversion/branches/1.7.x-issue4332:1453478-1460963
+/subversion/branches/1.7.x-issue4340:1461589-1485180
+/subversion/branches/1.7.x-issue4408:1512143-1514943
+/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-issue4k:1166502-1167193
+/subversion/branches/1.7.x-javahl-exception-crash:1586451-1589333
/subversion/branches/1.7.x-log-diff:1295670-1295699
+/subversion/branches/1.7.x-md5-collision:1600982-1615192
+/subversion/branches/1.7.x-neon-0.30:1566319-1568587
/subversion/branches/1.7.x-neon-default:1148803-1158680
/subversion/branches/1.7.x-neon-properr:1440619-1461944
/subversion/branches/1.7.x-r1152189:1152759-1154249
@@ -32,6 +48,7 @@
/subversion/branches/1.7.x-r1201824:1202121-1207333
/subversion/branches/1.7.x-r1210147:1213310-1293110
/subversion/branches/1.7.x-r1213331:1213684-1213756
+/subversion/branches/1.7.x-r1227815-conflict:1642662-1643026
/subversion/branches/1.7.x-r1232221:1232358-1238008
/subversion/branches/1.7.x-r1236343:1236628-1239394
/subversion/branches/1.7.x-r1242759:1372522-1393041
@@ -54,8 +71,33 @@
/subversion/branches/1.7.x-r1401915:1401934-1407349
/subversion/branches/1.7.x-r1407131:1407164-1419607
/subversion/branches/1.7.x-r1423646:1423647-1424282
+/subversion/branches/1.7.x-r1426752:1426753-1485335
+/subversion/branches/1.7.x-r1426762:1538732-1538859
+/subversion/branches/1.7.x-r1427278:1433724-1485338
+/subversion/branches/1.7.x-r1461743:1461745-1482189
+/subversion/branches/1.7.x-r1462041:1617243-1641028
+/subversion/branches/1.7.x-r1475724:1475743-1482192
+/subversion/branches/1.7.x-r1481010:1481034-1482194
+/subversion/branches/1.7.x-r1482759:1483584-1485046
+/subversion/branches/1.7.x-r1507044:1507300-1511568
+/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-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-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-javahl-exception-crash:1586439
+/subversion/branches/1.8.x-openssl-dirs:1535139
+/subversion/branches/1.8.x-serf-1.3+-windows:1517123
/subversion/branches/atomic-revprop:965046-1000689
/subversion/branches/bdb-reverse-deltas:872050-872529
/subversion/branches/diff-callbacks3:870059-870761
@@ -110,4 +152,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,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,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,1212482,12124
84,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,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,1292322,1292507,12
92516,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,1306334,1307177,1309992,1310378,1310428,1310535,1310594,1311702,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,1338810,1339164,1340556,1341012,1341031,1341034,1341076,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,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,1407131,1407812,1408650,1409146,1409939,1410106,1410203,1419670-1419681,1421011,1421103,1421380,1422053,1422100,1423585,1423646,1425368,1426138,1426264,1429201,1435361,1443763,1443929,1452967,1453780,1454088,1454217,1455352,1458341,1459599,1461278,1461760,1462293,1462300,1462302,1462321,1462334
+/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
Modified: subversion/branches/1.7.x-issue4340-repos/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/CHANGES?rev=1645439&r1=1645438&r2=1645439&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/CHANGES (original)
+++ subversion/branches/1.7.x-issue4340-repos/CHANGES Sun Dec 14 11:44:03 2014
@@ -1,3 +1,224 @@
+Version 1.7.19
+(15 Dec 2014, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.19
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * rm: display the proper URL in commit log editor (r1591123)
+ * diff: fix invalid read during suffix scanning (issue #4339)
+ * fix crash in eclipse IDE with GNOME Keyring (issue #3498)
+ * checkout/update: fix file externals failing to follow history and
+ subsequently silently failing (issue #4185)
+
+ - Server-side bugfixes:
+ * svnadmin dump: don't let invalid mergeinfo prevent a dump (issue #4476)
+ * mod_dav_svn: reject requests with missing repository paths (r1643409)
+ * mod_dav_svn: reject requests with invalid virtual transaction names
+ (r1643437)
+ * mod_dav_svn: avoid unneeded memory growth in resource walking
+ (issue #4531)
+
+ Developer-visible changes:
+ - General:
+ * properly generate a version resource when building on Windows (r1542610,
+ r1564576, r1568180)
+ * fix a problem with the unix build that could result in linking to the
+ wrong Subversion libraries at build or at run time (r1594157)
+ * use a proper intermediate directory when building with Visual Studio
+ 2003-2008 (r1595431)
+ * fix LIBTOOL_M4 and LIBTOOL_CONFIG variable not be evaluated properly
+ during a unix build (r1637826)
+ * allow the use of libtool 2.4.3 (r1640862, r1640873, r1643793)
+
+
+Version 1.7.18
+(11 Aug 2014, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.18
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * guard against md5 hash collisions when finding cached credentials
+ (r1550691, r1550772, r1600909)
+ * ra_serf: properly match wildcards in SSL certs. (r1615211, 1615219)
+ * ra_serf: ignore the CommonName in SSL certs where there are Subject Alt
+ Names (r1565531, r1566503, r1568349)
+
+ Developer-visible changes:
+ - General:
+ * fix ocassional failure in checkout_tests.py test 12. (r1496127)
+ * disable building ZLib's assembly optimizations on Windows.
+
+
+Version 1.7.17
+(07 May 2014, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.17
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * log: use proper peg revision over DAV (r1568872)
+ * move: fix errors when moving files between an external and the parent
+ working copy (r1551579)
+ * copy: fix 'svn copy URL WC' on relocated working copies
+ (r1580626, r1580650)
+
+ - Server-side bugfixes:
+ * mod_dav_svn: blacklist building with broken versions of httpd; 2.2.25,
+ 2.4.5 and 2.4.6 (r1545835)
+ * mod_dav_svn: detect out of dateness correctly during commit (issue #4480)
+
+ Developer-visible changes:
+ - General:
+ * fix libmagic detection with custom LDFLAGS (r1577200)
+ * fix a missing null byte when handling old pre-1.4 deltas (r1587968)
+ * support building with Serf 1.3.x (r1517123, r1535139)
+
+ - Bindings:
+ * javahl: fix crash from resolve callback throwing an exception (r1586439)
+
+
+Version 1.7.16
+(26 Feb 2014, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.16
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * copy: fix some scenarios that broke the working copy (r1560690)
+ * diff: fix regressions due to fixes in 1.7.14 (issue #4460)
+
+ - Server-side bugfixes:
+ * mod_dav_svn: prevent crashes with SVNListParentPath on (CVE-2014-0032)
+ * reduce memory usage during checkout and export (r1564215)
+
+ Developer-visible changes:
+ - General:
+ * fix failure in checkout_tests.py
+ * support compiling against Cyrus sasl 2.1.25 (r1404912, r1413402)
+ * support compiling against neon 0.30.x (r1566320)
+
+
+Version 1.7.15
+(Not released, see changes for 1.7.16.)
+
+
+Version 1.7.14
+(25 Nov 2013, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.14
+
+ User-visible changes:
+ - Client- and server-side bugfixes:
+ * fix assertion on urls of the form 'file://./' (r1516806)
+
+ - Client-side bugfixes:
+ * upgrade: fix an assertion when used with pre-1.3 wcs (r1530849)
+ * ra_local: fix error with repository in Windows drive root (r1518184)
+ * fix crash on windows when piped command is interrupted (r1522892)
+ * fix externals that point at redirected locations (issues #4428, #4429)
+ * diff: fix incorrect calculation of changes in some cases (issue #4283)
+ * diff: fix errors with added/deleted targets (issues #4153, #4421)
+
+ - Server-side bugfixes:
+ * mod_dav_svn: Prevent crashes with some 3rd party modules (r1537360 et al)
+ * fix OOM on concurrent requests at threaded server start (r1527103 et al)
+ * fsfs: limit commit time of files with deep change histories (r1536790)
+ * mod_dav_svn: canonicalize paths properly (r1542071)
+
+ - Other tool improvements and bugfixes:
+ * mod_dontdothat: Fix the uri parser (r1542069 et al)
+
+ Developer-visible changes:
+ - Bindings:
+ * javahl: canonicalize path for streamFileContent method (r1524869)
+
+
+Version 1.7.13
+(29 Aug 2013, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.13
+
+ User-visible changes:
+ - General
+ * merge: fix bogus mergeinfo with conflicting file merges (issue #4306)
+ * diff: fix duplicated path component in '--summarize' output (issue #4408)
+ * ra_serf: ignore case when checking certificate common names (r1514763)
+
+ - Server-side bugfixes:
+ * svnserve: fix creation of pid files (r1516556)
+ * mod_dav_svn: better status codes for commit failures (r1490684)
+ * mod_dav_svn: do not map requests to filesystem (r1512432 et al)
+
+ Developer-visible changes:
+ - General:
+ * support linking against gssapi on Solaris 10 (r1515068)
+ * don't use uninitialized variable to produce an error code (r1482282)
+
+ - Bindings:
+ * swig-pl: fix SVN::Client not honoring config file settings (r150744)
+ * swig-pl & swig-py: disable unusable svn_fs_set_warning_func (r1515119)
+
+
+Version 1.7.12
+(Not released, see changes for 1.7.13.)
+
+
+Version 1.7.11
+(23 Jul 2013, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.11
+
+ User-visible changes:
+ - General
+ * translation updates for Simplified Chinese
+
+ - Server-side bugfixes:
+ * mod_dav_svn: fix incorrect path canonicalization (r1503528)
+ See CVE-2013-4131, and descriptive advisory at
+ http://subversion.apache.org/security/CVE-2013-4131-advisory.txt
+
+ - Other tool improvements and bugfixes:
+ * fix argument processing in contrib hook scripts (r1485350)
+ See CVE-2013-2088, and descriptive advisory at
+ http://subversion.apache.org/security/CVE-2013-2088-advisory.txt
+
+ Developer-visible changes:
+ - Bindings:
+ * javahl: fix bug in error constructing code (r1405922)
+
+
+Version 1.7.10
+(30 May 2013, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.10
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * fix 'svn revert' "no such table: revert_list" spurious error (issue #4168)
+ * fix 'svn diff' doesn't show some locally added files (issue #3797)
+ * fix changelist filtering when --changelist values aren't UTF8 (r1475724)
+ * fix 'svn diff --git' shows wrong copyfrom (issue #4294)
+ * fix 'svn diff -x-w' shows wrong changes (issues #4133 and #4270, r1427278)
+ * fix 'svn blame' sometimes shows every line as modified (issue #4034)
+ * fix regression in 'svn status -u' output for externals (r1434750)
+ * fix file permissions change on commit of file with keywords (issue #4331)
+ * improve some fatal error messages (r1465975)
+ * fix externals not removed when working copy is made shallow (issue #3741)
+
+ - Server-side bugfixes:
+ * fix FSFS repository corruption due to newline in filename (issue #4340)
+ See CVE-2013-1968, and descriptive advisory at
+ http://subversion.apache.org/security/CVE-2013-1968-advisory.txt
+ * fix svnserve exiting when a client connection is aborted (r1482759)
+ See CVE-2013-2112, and descriptive advisory at
+ http://subversion.apache.org/security/CVE-2013-2112-advisory.txt
+ * fix svnserve memory use after clear (issue #4365)
+ * fix repository corruption on power/disk failure on Windows (r1483781)
+
+ Developer-visible changes
+ - General:
+ * make get-deps.sh compatible with Solaris /bin/sh (r1451678)
+ * fix infinite recursion bug in get-deps.sh (r1421541, r1424977)
+ * fix uninitialised output parameter of svn_fs_commit_txn() (r1461743)
+
+ - Bindings:
+ * fix JavaHL thread-safety bug (r1476359)
+
+
Version 1.7.9
(04 Apr 2013, from /branches/1.7.x)
http://svn.apache.org/repos/asf/subversion/tags/1.7.9
@@ -10,6 +231,9 @@ http://svn.apache.org/repos/asf/subversi
* fix segfault when using kwallet (r1421103)
- Server-side bugfixes:
+ See CVE-2013-1845, CVE-2013-1846, CVE-2013-1847, CVE-2013-1849,
+ and CVE-2013-1884, and descriptive advisories at
+ http://subversion.apache.org/security/
* svnserve will log the replayed rev not the low-water rev. (r1461278)
* mod_dav_svn will omit some property values for activity urls (r1453780)
* fix an assertion in mod_dav_svn when acting as a proxy on / (issue #4272)
@@ -43,7 +267,7 @@ http://svn.apache.org/repos/asf/subversi
* fix svn patch ignoring hunks after no trailing newline (r1399174)
* fix hang with ra_serf during error processing (r1403583)
* ignore file externals with mergeinfo when merging (r1401915)
- * fix SEGV with "svnmucc cp rev arg" during argv processing (issue #4079)
+ * fix "svnmucc cp" segfault with a missing last argument (issue #4079)
* fix conflict handling on symlinks (issue #4091)
- Server-side bugfixes:
@@ -120,7 +344,7 @@ http://svn.apache.org/repos/asf/subversi
* fix ra_serf against Subversion 1.2 servers (r1349367)
* fix 'svn upgrade' on working copies with certain tree conflicts (r1345482)
* avoid workqueue references to system temp dir (r1367854)
- * allow non-existant canonical paths (r1367853)
+ * allow non-existent canonical paths (r1367853)
* fix 'svn revert --depth files' to operate on files (r1365554)
* fix ra_serf XML namespace handling against malicious server (r1337441)
* fix relocate with server-relative externals (issue 4216)
@@ -472,7 +696,7 @@ the 1.6 release: http://subversion.apac
* fixed: rm -> ci -> cp = missing directory (issue #2763)
* fixed: 'svn info' returns parent info on missing dirs (issue #3178)
* fixed: spurious prop conflict with 'merge --reintegrate' (issue #3919)
- * fixed: 'svn --version' fails with non-existant $HOME (issue #3947)
+ * fixed: 'svn --version' fails with non-existent $HOME (issue #3947)
* fixed: unforced export silently overwites existing file (issue #3799)
* fixed: reverse merge which adds subtree mergeinfo fails (issue #3978)
* fixed: 'svn up -r{R>HEAD}' hangs client over ra_svn (issue #3963)
@@ -539,6 +763,25 @@ the 1.6 release: http://subversion.apac
* fix type mapping of svn_txdelta_window_t in python bindings (issue #3688)
+Version 1.6.23
+(30 May 2013, from /branches/1.6.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.6.23
+
+ User-visible changes
+ - Server-side bugfixes:
+ * fix FSFS repository corruption due to newline in filename (issue #4340)
+ * fix svnserve exiting when a client connection is aborted (r1482759)
+ See CVE-2013-2112, and descriptive advisory at
+ http://subversion.apache.org/security/CVE-2013-2112-advisory.txt
+
+ - Other tool improvements and bugfixes:
+ * fix argument processing in contrib hook scripts (r1485350)
+
+
+Version 1.6.22
+(Not released, see changes for 1.6.23.)
+
+
Version 1.6.21
(04 Apr 2013, from /branches/1.6.x)
http://svn.apache.org/repos/asf/subversion/tags/1.6.21
@@ -628,9 +871,9 @@ http://svn.apache.org/repos/asf/subversi
* fix crash in mod_dav_svn with GETs of baselined resources (r1104126)
See CVE-2011-1752, and descriptive advisory at
http://subversion.apache.org/security/CVE-2011-1752-advisory.txt
- * fixed: write-through proxy could direcly commit to slave (r917523)
+ * fixed: write-through proxy could directly commit to slave (r917523)
* detect a particular corruption condition in FSFS (r1100213)
- * improve error message when clients refer to unkown revisions (r939000)
+ * improve error message when clients refer to unknown revisions (r939000)
* bugfixes and optimizations to the DAV mirroring code (r878607)
* fixed: locked and deleted file causes tree conflict (issue #3525)
* fixed: update touches locked file with svn:keywords property (issue #3471)
@@ -1000,7 +1243,7 @@ http://svn.apache.org/repos/asf/subversi
* improve performance of 'svn update' on large files (r36389, et. al.)
* fixed: error leak and potential crash (r36860)
* fixed: parent directory handling on Windows (r36049, -50, -51, -131)
- * fixed: unintialized memory errors (r36252, -3)
+ * fixed: uninitialized memory errors (r36252, -3)
* fixed: potential working copy corruption (r36714)
* fixed: working copy upgrade error (r36302)
* fixed: pointer dereference error (r36783)
Propchange: subversion/branches/1.7.x-issue4340-repos/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 14 11:44:03 2014
@@ -1,7 +1,9 @@
/subversion/branches/1.5.x-r30215/CHANGES:870312
+/subversion/branches/1.7.x/CHANGES:1480943-1645438
/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
+/subversion/branches/1.7.x-issue4153/CHANGES:1309894-1539233
/subversion/branches/1.7.x-issue4169/CHANGES:1330537-1336116
/subversion/branches/1.7.x-neon-default/CHANGES:1148803-1158680
/subversion/branches/1.7.x-r1152189/CHANGES:1152759-1154249
@@ -63,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-1370776,1382843,1383466,1383946,1392502,1393061,1393156,1393165,1393542,1393551,1393598,1409939,1419670-1419681,1423646,1426138,1426264,1443763,1462293,1462300,1462302,1462321,1462334
+/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
Modified: subversion/branches/1.7.x-issue4340-repos/NOTICE
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/NOTICE?rev=1645439&r1=1645438&r2=1645439&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/NOTICE (original)
+++ subversion/branches/1.7.x-issue4340-repos/NOTICE Sun Dec 14 11:44:03 2014
@@ -1,5 +1,5 @@
-Subversion
-Copyright 2010 The Apache Software Foundation
+Apache Subversion
+Copyright 2014 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 (added)
+++ svn:mergeinfo Sun Dec 14 11:44:03 2014
@@ -0,0 +1,155 @@
+/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-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
+/subversion/branches/1.7.x-fsfs-commit/NOTICE:1536760-1541380
+/subversion/branches/1.7.x-gssapi-solaris10/NOTICE:1453164-1515067
+/subversion/branches/1.7.x-issue3888/NOTICE:1148937-1149162
+/subversion/branches/1.7.x-issue3975/NOTICE:1160761-1161546
+/subversion/branches/1.7.x-issue3976/NOTICE:1161731-1165397
+/subversion/branches/1.7.x-issue4032/NOTICE:1186668-1186784
+/subversion/branches/1.7.x-issue4035/NOTICE:1186202-1186315
+/subversion/branches/1.7.x-issue4035-r1185738/NOTICE:1186316-1186778
+/subversion/branches/1.7.x-issue4059/NOTICE:1239745-1242661
+/subversion/branches/1.7.x-issue4087/NOTICE:1243707-1336073
+/subversion/branches/1.7.x-issue4093/NOTICE:1229839-1230236
+/subversion/branches/1.7.x-issue4102/NOTICE:1292401-1295402
+/subversion/branches/1.7.x-issue4123/NOTICE:1293358-1293812
+/subversion/branches/1.7.x-issue4144/NOTICE:1305854-1306143
+/subversion/branches/1.7.x-issue4153/NOTICE:1309894-1539233
+/subversion/branches/1.7.x-issue4161/NOTICE:1330697-1331209
+/subversion/branches/1.7.x-issue4166/NOTICE:1330474-1336071
+/subversion/branches/1.7.x-issue4169/NOTICE:1330537-1336116
+/subversion/branches/1.7.x-issue4257/NOTICE:1454456-1461404
+/subversion/branches/1.7.x-issue4263/NOTICE:1423588-1434547
+/subversion/branches/1.7.x-issue4270/NOTICE:1433737-1485341
+/subversion/branches/1.7.x-issue4306/NOTICE:1438872-1514941
+/subversion/branches/1.7.x-issue4332/NOTICE:1453478-1460963
+/subversion/branches/1.7.x-issue4340/NOTICE:1461589-1485180
+/subversion/branches/1.7.x-issue4408/NOTICE:1512143-1514943
+/subversion/branches/1.7.x-issue4428/NOTICE:1525912-1538136
+/subversion/branches/1.7.x-issue4460/NOTICE:1563069-1564892
+/subversion/branches/1.7.x-issue4480/NOTICE:1588781-1590205
+/subversion/branches/1.7.x-issue4k/NOTICE:1166502-1167193
+/subversion/branches/1.7.x-javahl-exception-crash/NOTICE:1586451-1589333
+/subversion/branches/1.7.x-log-diff/NOTICE:1295670-1295699
+/subversion/branches/1.7.x-md5-collision/NOTICE:1600982-1615192
+/subversion/branches/1.7.x-neon-0.30/NOTICE:1566319-1568587
+/subversion/branches/1.7.x-neon-default/NOTICE:1148803-1158680
+/subversion/branches/1.7.x-neon-properr/NOTICE:1440619-1461944
+/subversion/branches/1.7.x-r1152189/NOTICE:1152759-1154249
+/subversion/branches/1.7.x-r1155160/NOTICE:1158704-1159223
+/subversion/branches/1.7.x-r1159093/NOTICE:1159097-1159230
+/subversion/branches/1.7.x-r1163557/NOTICE:1163574-1170648
+/subversion/branches/1.7.x-r1173425/NOTICE:1173429-1176454
+/subversion/branches/1.7.x-r1180154/NOTICE:1186224-1186351
+/subversion/branches/1.7.x-r1201824/NOTICE:1202121-1207333
+/subversion/branches/1.7.x-r1210147/NOTICE:1213310-1293110
+/subversion/branches/1.7.x-r1213331/NOTICE:1213684-1213756
+/subversion/branches/1.7.x-r1227815-conflict/NOTICE:1642662-1643026
+/subversion/branches/1.7.x-r1232221/NOTICE:1232358-1238008
+/subversion/branches/1.7.x-r1236343/NOTICE:1236628-1239394
+/subversion/branches/1.7.x-r1242759/NOTICE:1372522-1393041
+/subversion/branches/1.7.x-r1306111/NOTICE:1306301-1331207
+/subversion/branches/1.7.x-r1341012/NOTICE:1341013-1355629
+/subversion/branches/1.7.x-r1348822/NOTICE:1348878-1355700
+/subversion/branches/1.7.x-r1352031/NOTICE:1431725-1435017
+/subversion/branches/1.7.x-r1352068/NOTICE:1352087-1364232
+/subversion/branches/1.7.x-r1361007/NOTICE:1361110-1367853
+/subversion/branches/1.7.x-r1361341/NOTICE:1361342-1367855
+/subversion/branches/1.7.x-r1365554/NOTICE:1365558-1367850
+/subversion/branches/1.7.x-r1375052/NOTICE:1376643-1380970
+/subversion/branches/1.7.x-r1383483/NOTICE:1383601-1383951
+/subversion/branches/1.7.x-r1388975/NOTICE:1392898-1393044
+/subversion/branches/1.7.x-r1389851/NOTICE:1389853-1392834
+/subversion/branches/1.7.x-r1389878/NOTICE:1389879-1393126
+/subversion/branches/1.7.x-r1389928/NOTICE:1390384-1391747
+/subversion/branches/1.7.x-r1398325/NOTICE:1398353-1398633
+/subversion/branches/1.7.x-r1399174/NOTICE:1399176-1403964
+/subversion/branches/1.7.x-r1401915/NOTICE:1401934-1407349
+/subversion/branches/1.7.x-r1407131/NOTICE:1407164-1419607
+/subversion/branches/1.7.x-r1423646/NOTICE:1423647-1424282
+/subversion/branches/1.7.x-r1426752/NOTICE:1426753-1485335
+/subversion/branches/1.7.x-r1426762/NOTICE:1538732-1538859
+/subversion/branches/1.7.x-r1427278/NOTICE:1433724-1485338
+/subversion/branches/1.7.x-r1461743/NOTICE:1461745-1482189
+/subversion/branches/1.7.x-r1462041/NOTICE:1617243-1641028
+/subversion/branches/1.7.x-r1475724/NOTICE:1475743-1482192
+/subversion/branches/1.7.x-r1481010/NOTICE:1481034-1482194
+/subversion/branches/1.7.x-r1482759/NOTICE:1483584-1485046
+/subversion/branches/1.7.x-r1507044/NOTICE:1507300-1511568
+/subversion/branches/1.7.x-r1527103/NOTICE:1527110-1541378
+/subversion/branches/1.7.x-r1541790/NOTICE:1541792-1542083
+/subversion/branches/1.7.x-r1551579/NOTICE:1551587-1589566
+/subversion/branches/1.7.x-r1564215/NOTICE:1564280-1564618
+/subversion/branches/1.7.x-r1568872-neon+serf/NOTICE:1568942-1569623
+/subversion/branches/1.7.x-r1574868/NOTICE:1575332-1642628
+/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-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
+/subversion/branches/1.7.x-svn-patch-eol-fixes/NOTICE:1207511-1235924
+/subversion/branches/1.8.x/NOTICE:1577779
+/subversion/branches/1.8.x-issue4480/NOTICE:1588775
+/subversion/branches/1.8.x-javahl-exception-crash/NOTICE:1586439
+/subversion/branches/1.8.x-openssl-dirs/NOTICE:1535139
+/subversion/branches/1.8.x-serf-1.3+-windows/NOTICE:1517123
+/subversion/branches/atomic-revprop/NOTICE:965046-1000689
+/subversion/branches/bdb-reverse-deltas/NOTICE:872050-872529
+/subversion/branches/diff-callbacks3/NOTICE:870059-870761
+/subversion/branches/diff-optimizations/NOTICE:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/NOTICE:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/NOTICE:870728-871118
+/subversion/branches/double-delete/NOTICE:870511-872970
+/subversion/branches/explore-wc/NOTICE:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals/NOTICE:871779-873302
+/subversion/branches/fs-rep-sharing/NOTICE:869036-873803
+/subversion/branches/fsfs-pack/NOTICE:873717-874575
+/subversion/branches/gnome-keyring/NOTICE:870558-871410
+/subversion/branches/http-protocol-v2/NOTICE:874395-876041
+/subversion/branches/in-memory-cache/NOTICE:869829-871452
+/subversion/branches/integrate-cache-item-serialization/NOTICE:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/NOTICE:998649-998852
+/subversion/branches/integrate-compression-level/NOTICE:1068651-1072287
+/subversion/branches/integrate-io-improvements/NOTICE:1068684-1072297
+/subversion/branches/integrate-is-cachable/NOTICE:1072568-1074082
+/subversion/branches/integrate-partial-getter/NOTICE:1072558-1076552
+/subversion/branches/integrate-readline-speedup/NOTICE:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/NOTICE:1068695-1072516
+/subversion/branches/integrate-txdelta-caching/NOTICE:1072541-1078213
+/subversion/branches/issue-2779-dev/NOTICE:965496-984198
+/subversion/branches/issue-2843-dev/NOTICE:871432-874179
+/subversion/branches/issue-3000/NOTICE:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/NOTICE:873375-874084
+/subversion/branches/issue-3148-dev/NOTICE:875193-875204
+/subversion/branches/issue-3220-dev/NOTICE:872210-872226
+/subversion/branches/issue-3242-dev/NOTICE:879653-896436
+/subversion/branches/issue-3334-dirs/NOTICE:875156-875867
+/subversion/branches/issue-3975/NOTICE:1152931-1160746
+/subversion/branches/kwallet/NOTICE:870785-871314
+/subversion/branches/log-g-performance/NOTICE:870941-871032
+/subversion/branches/merge-skips-obstructions/NOTICE:874525-874615
+/subversion/branches/nfc-nfd-aware-client/NOTICE:870276,870376
+/subversion/branches/performance/NOTICE:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985695,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,1029335-1029336,1029339-1029340,1029342,1029344,1
030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/py-tests-as-modules/NOTICE:956579-1033052
+/subversion/branches/ra_serf-digest-authn/NOTICE:875693-876404
+/subversion/branches/reintegrate-improvements/NOTICE:873853-874164
+/subversion/branches/revprop-packing/NOTICE:1143907,1143971,1143997,1144017,1144499,1144568
+/subversion/branches/subtree-mergeinfo/NOTICE:876734-878766
+/subversion/branches/svn-mergeinfo-enhancements/NOTICE:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/NOTICE:918519-934609
+/subversion/branches/svnpatch-diff/NOTICE:865738-876477
+/subversion/branches/svnraisetc/NOTICE:874709-875149
+/subversion/branches/svnserve-logging/NOTICE:869828-870893
+/subversion/branches/tc-issue-3334/NOTICE:874697-874773
+/subversion/branches/tc-merge-notify/NOTICE:874017-874062
+/subversion/branches/tc-resolve/NOTICE:874191-874239
+/subversion/branches/tc_url_rev/NOTICE:874351-874483
+/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
Modified: subversion/branches/1.7.x-issue4340-repos/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/STATUS?rev=1645439&r1=1645438&r2=1645439&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/STATUS (original)
+++ subversion/branches/1.7.x-issue4340-repos/STATUS Sun Dec 14 11:44:03 2014
@@ -10,201 +10,11 @@ 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.10:
+Status of 1.7.20:
Candidate changes:
==================
- * r1306275, and other revisions
- New diff support code for added/deleted files and directories.
- Fixes issue #4153, "svn log --diff" on moved file gives "not found",
- and other problems.
- Justification:
- The current code (introduced in 1.7.x in the r1207351 backport commit)
- produces inconsistent paths in diff output (see
- http://svn.haxx.se/dev/archive-2012-03/0385.shtml), and it also breaks
- with the paradigm that the target of an editor drive may never have more
- than one path component (which according to cmpilato is an API violation).
- Notes:
- Please read the branch and related trunk log messages for detailed notes
- about these changes.
- Branch:
- ^/subversion/branches/1.7.x-issue4153
- Votes:
- +1: stsp
-
- * ^/subversion/branches/1.7.x-commit-performance
- r1337118, r1337281, r1337374, r1337377, r1337392, r1337394, r1337485
- Use the working copy status walker as a first filter to find committable
- nodes.
- Justification:
- Huge performance boost. Especially on NFS.
- Notes:
- Backports the status walker framework. Many other parts are backportable
- too, but this branch delivers the plumbing.
- [JAF] We might want to include some of the subsequent updates to this
- code, such as: r1337403, r1337475, r1337736, r1338059, r1338338.
- Votes:
- +0: rhuijben (I would like to see some test results before backporting)
-
- * r1409804
- Add a delimiter between the two chains in svn_error_compose_create().
- Justification:
- Allow users to tell where the second error chain starts -- avoids
- misrepresentation that the first error is caused by the second.
- Votes:
- -0: rhuijben (I'm not sure if this should be in a patch release and the
- stacktrace where this refers to is maintainer only)
- +1: danielsh (err->file and err->line are only in maintainer builds.
- this is about err->message which is valid in all builds)
-
- * r1421541, r1424977
- Fix infinite recursion in './get-deps.sh'.
- Justification:
- Trivial fix to plug an edge case.
- Votes:
- -0: rhuijben (Is this needed on this branch?)
- +1: danielsh (as much as it's needed on trunk)
-
- * r1423837, r1423840, r1423848
- Fix issue #4168, "no such table: revert_list" for nested wc in sparse wc
- Justification:
- Accessing the wrong database from the revert code gives an ugly error
- which might not be easy to work around.
- Votes:
- +1: rhuijben, pburba
-
- * r1426752
- Fix Issue #4133, an issue in the diff-libraries whitespace normalization
- handling that might make diff use the wrong tokens, showing up as
- unexpected changes.
- Justification:
- The diff library should behave properly when suppressing whitespace
- changes.
- Notes:
- The branch is just needed for avoiding a conflict with the testcase.
- Will probably conflict again if r1426762 and/or r1427278 are merged to
- 1.7.x, because they all add a test to the testlist in diff-diff3-test.c.
- Branch:
- ^/subversion/branches/1.7.x-r1426752
- Votes:
- +1: rhuijben, jcorvel
-
- * r1426762
- Fix issue #4283, When the identical suffix starts at chunk boundary, "svn
- diff" produces incorrect diff.
- Justification:
- Without this patch the identical suffix might show up as an added or
- deleted suffix of a file.
- Notes:
- Will probably conflict if r1426752 and/or r1427278 are merged to
- 1.7.x, because they all add a test to the testlist in diff-diff3-test.c.
- Votes:
- +1: rhuijben, jcorvel
-
- * r1426830
- Resolve issue #3797, by making sure that local changes at the same path
- as a not present file are not skipped.
- Justification:
- Improves 'svn diff' handling of local changes.
- Votes:
- +1: rhuijben, pburba
-
- * r1427278
- Fix another issue in the diff-libraries whitespace normalization
- handling that might make diff show unexpected changes, and even trying
- to read beyond end of file.
- Justification:
- The diff library should behave properly when suppressing whitespace
- changes. See also http://svn.haxx.se/dev/archive-2012-12/0556.shtml
- for some examples of this bug.
- Notes:
- The branch is just needed for avoiding a conflict with adding a comment.
- Will probably conflict again if r1426752 and/or r1426762 are merged to
- 1.7.x, because they all add a test to the testlist in diff-diff3-test.c.
- Branch:
- ^/subversion/branches/1.7.x-r1427278
- Votes:
- +1: jcorvel, rhuijben
-
- * r1427197, r1427210
- Fix issue #4270 'diff -cN shows wrong line changed'. In the optimized
- code path (unaligned access) for prefix/suffix scanning, the diff would
- be incorrect when a '\r' is not immediately followed by a '\n'.
- Justification:
- Diff should show the correct changes. Failure to do so can lead to
- incorrect updates/merges (because diff3 suffers from the same bug).
- Branch:
- ^/subversion/branches/1.7.x-issue4270
- Votes:
- +1: jcorvel, rhuijben
-
- * r1434405, r1434414, r1434418
- Fix issue #4294 'diff --git shows wrong copy from'. Moving a dir
- causes diff --git to output incorrect sources for the diff.
- Justification:
- Diff should show the correct output. Failiure to do so can lead to
- incorrect interoperation with other systems.
- Votes:
- +1: breser
- +1: rhuijben (even though it only fixes one of the many --git issues)
-
- * r1434128, r1434435, r1434476
- Fix issue #4034, 'blame on files with non-native eol-style sees every
- line as modified'.
- Justification:
- When blaming to the working copy instead of the base version eol styles
- all other styles than those with "\n" repository form show up as
- entirely changed.
- Votes:
- +1: rhuijben
-
- * r1434750
- Resolve regression in 'svn status -u' output when running on externals.
- Without this patch the paths in directory externals are shown as absolute
- while all others are shown relative/as provided by the user.
- Justification:
- Consistent api behavior is goog
- Votes:
- +1: rhuijben
-
- * r1435635, r1435714, r1435722, r1435737
- When svn update removes a switched subtree because it was deleted in the
- target revision, it would be nice if a future update would bring back
- the originally node that existed before switching. (Issue #4295)
- Justification:
- After this operation the working copy doesn't match the repository
- without obviouse way to recover.
- Notes:
- The real fix is in r1435722. The other revisions tweak the test that
- also triggered a different revision on trunk.
- Branch:
- ^/subversion/branches/1.7.x-issue-4295
- Votes:
- +1: rhuijben
-
- * r1438602, r1438683, r1441810
- Fix issue #4306, "multiple editor drive file merges record wrong mergeinfo
- during conflicts"
- Justification:
- Bogus mergeinfo is created during conflicting merges with file targets.
- Notes: r1438602 is the initial test and r1438683 the initial fix. r1441810
- is a follow-up that addressed a bug in the initial fix (see
- http://svn.haxx.se/dev/archive-2013-02/0001.shtml) and also reworked the
- test to use prop edits rather than text edits as the changes to be
- merged. Unfortunately, 1.7.x has unrelated problems with property
- conflicts: It doesn't abort the merge if it encounters them! It merrily
- plugs along sans any "One or more conflicts were produced while
- merging...resolve all conflicts and rerun the merge to apply the
- remaining unmerged revisions" error (this is fixed on trunk). So while
- r1441810 is a valid fix (IMO) its test fails for unrelated reasons. So
- I reworked the earlier version of test to demonstrate the problem
- r1441810 fixes, but using file conflicts.
- Branch:
- ^/subversion/branches/1.7.x-issue4306
- Votes:
- +1: stsp (r1438602 and r1438683 only), pburba
-
* r1438879
Make 'show-diff' at the interactive conflict prompt show nicer diffs.
Justification:
@@ -214,103 +24,88 @@ Candidate changes:
^/subversion/branches/1.7.x-r1438879
Votes:
+1: stsp
-
- * r1445753
- Fix issue #3741, 'externals not removed when working copy is made shallow'.
- Justification:
- Externals linger after update --set-depth empty, causing unnecessary
- tree conflicts when the working copy is updated back to depth infinity.
- See regression test and also the recipe script attached to issue #3741.
- Votes:
- +1: stsp, rhuijben
-
- * r1451678, r1452617
- Make get-deps.sh compatible with Solaris /bin/sh.
- Justification:
- Make get-deps.sh work on Solaris.
- Votes:
- +1: breser
- +0: rhuijben (untested)
-
- * r1452780
- Address issue #4331, "working copy permissions change on commit for files
- with keywords".
- Justification:
- Keyword translation should not affect file permission bits.
+ +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
+ change I would commit.)
+
+ * r1461760
+ Additional fix related to issue #4340, "filenames containing \n corrupt
+ FSFS repositories"
+ Justification:
+ This change makes libsvn_repos block filenames containing control
+ characters. Control characters in filenames have always been rejected
+ by libsvn_client, but client-side software bypassing libsvn_client
+ could still commit such filenames. Control characters in filenames
+ can cause problems not just in FSFS but also in dump files, unidiff,
+ and possibly elsewhere. It is a good idea to make the client and
+ server consistent.
+ See discussion linked from issue #4340 for more information.
+ Branch:
+ ^/subversion/branches/1.7.x-issue4340-repos
Votes:
+1: stsp
- +0: rhuijben (code looks ok, but is a no-op on Windows)
+ -0: danielsh (restrictions not suitable for introduction in patch release;
+ dev@ thread started 2013/05/10 9pm)
- * ^/subversion/branches/1.7.x-gssapi-solaris10
+ * r1542765, r1571214
+ Add Sqlite index information.
Justification:
- Make it easier to build svn+serf with kerberos support on Solaris10.
+ Adding this information explains to Sqlite how we use our indexes. While
+ Subversion 1.7 doesn't depend on this as much as 1.8 as we didn't tune the
+ queries as much at that time, this information will make several queries
+ use indexes instead of table scans.
Branch:
- ^/subversion/branches/1.7.x-gssapi-solaris10
- Notes:
- rhuijben: Is this necessary for 1.7. I think gssapi was moved to serf
- with/before serf 1.0, which is a 1.7 requirement?
+ ^/subversion/branches/1.7.x-r1542765
Votes:
- +1: breser
+ +1: rhuijben
- * r1461562, r1461580, r1465995, r1465998
- Fix issue #4340, "filenames containing \n corrupt FSFS repositories"
+ * r1644158, r1644530, r1644595, r1644599
+ Fix patch output for reordered hunks, part of issue 4533.
Justification:
- Control characters can severely corrupt FSFS revision files and
- should never enter the repository for this reason. See discussion
- linked form issue #4340 for more information.
- Notes:
- r1465995 and r1465998 revise the changes made in the earlier revisions,
- and are the result of a long dev@ discussion that eventually concluded
- in this subthread: http://svn.haxx.se/dev/archive-2013-04/0056.shtml
+ Output is invalid.
Branch:
- ^/subversion/branches/1.7.x-issue4340
- Votes:
- +1: stsp
- -1: cmpilato ("How did this expand from 'newlines' to 'control
- characters'?!
- <danielsh> that has been addressed in HEAD)
- -0: danielsh (FSFS escape_newline should escape any control character,
- not just '\n'; libsvn_repos restrictions not suitable
- for introduction in a patch release)
-
- * r1461743
- svn_fs_commit_txn: set output parameter in non-maintainer-with-special-flags
- builds.c
- Justification:
- Part of the API contract.
- Branch: 1.7.x-r1461743
+ ^/subversion/branches/1.8.x-r1644595
Votes:
- +1: danielsh
+ +1: philip
- * r1465975
- Replace assertions that trigger in the wild with proper error messages.
- Justification:
- User-friendliness, see http://svn.haxx.se/users/archive-2013-04/0064.shtml
- Showing the problematic path will help with figuring out the problem.
- Votes:
- +1: stsp
- +1: danielsh (should we avoid svn_dirent_local_style in this case, i.e.,
- print the literal value that nodes.local_relpath is expected
- to contain?)
-
- * r1475724
- Fix changelist filtering when --changelist values aren't UTF8.
- Justification:
- User-reported buglet that prevents the use of changelist
- filtering altogether for those sorts of changelist names.
- Branch: 1.7.x-r1475724
- Votes:
- +1: cmpilato
+Veto-blocked changes:
+=====================
- * r1476359
- JavaHL thread safety bug.
+ * r1409804
+ Add a delimiter between the two chains in svn_error_compose_create().
Justification:
- Unexpected exceptions can be thrown when thread issues are encountered.
+ Allow users to tell where the second error chain starts -- avoids
+ misrepresentation that the first error is caused by the second.
Votes:
- +1: markphip
+ -0: rhuijben (I'm not sure if this should be in a patch release and the
+ stacktrace where this refers to is maintainer only)
+ +1: danielsh (err->file and err->line are only in maintainer builds.
+ this is about err->message which is valid in all builds)
+ -1: stsp (not a bug fix, changes output in a patch release)
-Veto-blocked changes:
-=====================
+ * r1643074
+ Don't let invalid mergeinfo stop 'svnadmin load' from working.
+ Part of issue #4476 "Mergeinfo containing r0 makes svnsync and svnadmin
+ dump fail".
+ Justification:
+ The presence of 'bad' metadata in a repository should not prevent
+ backing up and restoring from a backup, given that this data does not
+ make the repository totally unusable.
+ Notes:
+ The 'svnadmin dump' part of this issue is already approved for backport.
+ The 'svnsync' part of this issue is not yet fixed.
+ 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)
Approved changes:
=================
Modified: subversion/branches/1.7.x-issue4340-repos/autogen.sh
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/autogen.sh?rev=1645439&r1=1645438&r2=1645439&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/autogen.sh (original)
+++ subversion/branches/1.7.x-issue4340-repos/autogen.sh Sun Dec 14 11:44:03 2014
@@ -23,6 +23,10 @@
### Run this to produce everything needed for configuration. ###
+# Some shells can produce output when running 'cd' which interferes
+# with the construct 'abs=`cd dir && pwd`'.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
# Run tests to ensure that our build requirements are met
RELEASE_MODE=""
RELEASE_ARGS=""
@@ -71,48 +75,80 @@ rm -f build/config.guess build/config.su
$libtoolize --copy --automake --force
ltpath="`dirname $libtoolize`"
-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
-if [ ! -f $ltfile ]; then
- echo "$ltfile not found (try setting the LIBTOOL_M4 environment variable)"
+if [ "x$LIBTOOL_M4" = "x" ]; then
+ ltm4_error='(try setting the LIBTOOL_M4 environment variable)'
+ if [ -d "$ltpath/../share/aclocal/." ]; then
+ ltm4=`cd "$ltpath/../share/aclocal" && pwd`
+ else
+ echo "Libtool helper path not found $ltm4_error"
+ echo " expected at: '$ltpath/../share/aclocal'"
+ exit 1
+ fi
+else
+ ltm4_error="(the LIBTOOL_M4 environment variable is: $LIBTOOL_M4)"
+ ltm4="$LIBTOOL_M4"
+fi
+
+ltfile="$ltm4/libtool.m4"
+if [ ! -f "$ltfile" ]; then
+ echo "$ltfile not found $ltm4_error"
exit 1
fi
-echo "Copying libtool helper: $ltfile"
+echo "Copying libtool helper: $ltfile"
# An ancient helper might already be present from previous builds,
# and it might be write-protected (e.g. mode 444, seen on FreeBSD).
# This would cause cp to fail and print an error message, but leave
# behind a potentially outdated libtool helper. So, remove before
# copying:
rm -f build/libtool.m4
-cp $ltfile build/libtool.m4
+cp "$ltfile" build/libtool.m4
for file in ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4; do
rm -f build/$file
if [ $lt_major_version -ge 2 ]; then
- ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/$file}
+ ltfile="$ltm4/$file"
- if [ ! -f $ltfile ]; then
- echo "$ltfile not found (try setting the LIBTOOL_M4 environment variable)"
+ if [ ! -f "$ltfile" ]; then
+ echo "$ltfile not found $ltm4_error"
exit 1
fi
- echo "Copying libtool helper: $ltfile"
- cp $ltfile build/$file
+ echo "Copying libtool helper: $ltfile"
+ cp "$ltfile" "build/$file"
fi
done
if [ $lt_major_version -ge 2 ]; then
+ if [ "x$LIBTOOL_CONFIG" = "x" ]; then
+ ltconfig_error='(try setting the LIBTOOL_CONFIG environment variable)'
+ if [ -d "$ltpath/../share/libtool/config/." ]; then
+ ltconfig=`cd "$ltpath/../share/libtool/config" && pwd`
+ elif [ -d "$ltpath/../share/libtool/build-aux/." ]; then
+ ltconfig=`cd "$ltpath/../share/libtool/build-aux" && pwd`
+ else
+ echo "Autoconf helper path not found $ltconfig_error"
+ echo " expected at: '$ltpath/../share/libtool/config'"
+ echo " or: '$ltpath/../share/libtool/build-aux'"
+ exit 1
+ fi
+ else
+ ltconfig_error="(the LIBTOOL_CONFIG environment variable is: $LIBTOOL_CONFIG)"
+ ltconfig="$LIBTOOL_CONFIG"
+ fi
+
for file in config.guess config.sub; do
- configfile=${LIBTOOL_CONFIG-`cd $ltpath/../share/libtool/config ; pwd`/$file}
+ configfile="$ltconfig/$file"
- if [ ! -f $configfile ]; then
- echo "$configfile not found (try setting the LIBTOOL_CONFIG environment variable)"
+ if [ ! -f "$configfile" ]; then
+ echo "$configfile not found $ltconfig_error"
exit 1
fi
- cp $configfile build/$file
+ echo "Copying autoconf helper: $configfile"
+ cp "$configfile" build/$file
done
fi
Modified: subversion/branches/1.7.x-issue4340-repos/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/build.conf?rev=1645439&r1=1645438&r2=1645439&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/build.conf (original)
+++ subversion/branches/1.7.x-issue4340-repos/build.conf Sun Dec 14 11:44:03 2014
@@ -331,6 +331,7 @@ msvc-export =
private\svn_token.h private\svn_adler32.h
private\svn_temp_serializer.h private\svn_io_private.h
private\svn_string_private.h private\svn_magic.h
+ private\svn_cert.h
# Working copy management lib
[libsvn_wc]
@@ -1223,6 +1224,7 @@ install = tools
libs = libsvn_repos libsvn_subr apr
[svn-populate-node-origins-index]
+description = Tool to populate the node origins index of a repository
type = exe
path = tools/server-side
sources = svn-populate-node-origins-index.c
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=1645439&r1=1645438&r2=1645439&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 Sun Dec 14 11:44:03 2014
@@ -118,6 +118,27 @@ apache_minor_version=AP_SERVER_MINORVERS
CPPFLAGS="$old_CPPFLAGS"
fi
+# check for some busted versions of mod_dav
+# in particular 2.2.25, 2.4.5, and 2.4.6 had the following bugs which are
+# troublesome for Subversion:
+# PR 55304: https://issues.apache.org/bugzilla/show_bug.cgi?id=55304
+# PR 55306: https://issues.apache.org/bugzilla/show_bug.cgi?id=55306
+# PR 55397: https://issues.apache.org/bugzilla/show_bug.cgi?id=55397
+if test -n "$APXS" && test "$APXS" != "no"; then
+ AC_MSG_CHECKING([mod_dav version])
+ old_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
+ blacklisted_versions_regex=["\"2\" \"\.\" (\"2\" \"\.\" \"25\"|\"4\" \"\.\" \"[56]\")"]
+ AC_EGREP_CPP([apache_version= *$blacklisted_versions_regex],
+ [
+#include "$APXS_INCLUDE/ap_release.h"
+apache_version=AP_SERVER_BASEREVISION],
+ [AC_MSG_RESULT([broken])
+ AC_MSG_ERROR([Apache httpd version includes a broken mod_dav; use a newer version of httpd])],
+ [AC_MSG_RESULT([acceptable])])
+ CPPFLAGS="$old_CPPFLAGS"
+fi
+
AC_ARG_WITH(apache-libexecdir,
[AS_HELP_STRING([[--with-apache-libexecdir[=PATH]]],
[Install Apache modules to PATH instead of Apache's
Modified: subversion/branches/1.7.x-issue4340-repos/build/ac-macros/berkeley-db.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/build/ac-macros/berkeley-db.m4?rev=1645439&r1=1645438&r2=1645439&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/build/ac-macros/berkeley-db.m4 (original)
+++ subversion/branches/1.7.x-issue4340-repos/build/ac-macros/berkeley-db.m4 Sun Dec 14 11:44:03 2014
@@ -89,7 +89,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
done
SVN_DB_INCLUDES="${SVN_DB_INCLUDES## }"
for l in [`echo "$withval" | $SED -e "s/.*:[^:]*:\([^:]*\):.*/\1/"`]; do
- LDFLAGS="$LDFLAGS -L$l"
+ LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS(-L$l)`"
done
SVN_DB_LIBS=""
for l in [`echo "$withval" | $SED -e "s/.*:\([^:]*\)/\1/"`]; do
Modified: subversion/branches/1.7.x-issue4340-repos/build/ac-macros/gssapi.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/build/ac-macros/gssapi.m4?rev=1645439&r1=1645438&r2=1645439&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/build/ac-macros/gssapi.m4 (original)
+++ subversion/branches/1.7.x-issue4340-repos/build/ac-macros/gssapi.m4 Sun Dec 14 11:44:03 2014
@@ -54,6 +54,17 @@ AC_DEFUN(SVN_LIB_RA_SERF_GSSAPI,
CFLAGS=""
SVN_GSSAPI_INCLUDES="`$KRB5_CONFIG --cflags`"
SVN_GSSAPI_LIBS="`$KRB5_CONFIG --libs gssapi`"
+ if test $? -ne 0; then
+ dnl Some platforms e.g. Solaris 10 don't support the gssapi argument
+ dnl and need krb5 instead. Since it doesn't tell us about gssapi
+ dnl we have to guess. So let's try -lgss and /usr/include/gassapi
+ SVN_GSSAPI_INCLUDES="$SVN_GSSAPI_INCLUDES -I/usr/include/gssapi"
+ SVN_GSSAPI_LIBS="`$KRB5_CONFIG --libs krb5` -lgss"
+ if test $? -ne 0; then
+ dnl Both k5b-config commands failed.
+ AC_MSG_ERROR([krb5-config returned an error])
+ fi
+ fi
SVN_GSSAPI_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($SVN_GSSAPI_LIBS)`"
CPPFLAGS="$CPPFLAGS $SVN_GSSAPI_INCLUDES"
CFLAGS="$old_CFLAGS"
Modified: subversion/branches/1.7.x-issue4340-repos/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/build/ac-macros/serf.m4?rev=1645439&r1=1645438&r2=1645439&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/build/ac-macros/serf.m4 (original)
+++ subversion/branches/1.7.x-issue4340-repos/build/ac-macros/serf.m4 Sun Dec 14 11:44:03 2014
@@ -85,7 +85,7 @@ AC_DEFUN(SVN_LIB_SERF,
SVN_SERF_LIBS="$serf_prefix/lib/lib$serf_major.la"
else
SVN_SERF_LIBS="-l$serf_major"
- LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
+ LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS(-L$serf_prefix/lib)`"
fi
elif test $serf_found = "reconfig"; then
serf_found=yes