Author: julianfoad
Date: Mon Mar 16 10:10:20 2015
New Revision: 1666947
URL: http://svn.apache.org/r1666947
Log:
On the 'move-tracking-2' branch: catch up with trunk@1666945.
Modified:
subversion/branches/move-tracking-2/ (props changed)
subversion/branches/move-tracking-2/BRANCH-README (props changed)
subversion/branches/move-tracking-2/BUGS (props changed)
subversion/branches/move-tracking-2/CHANGES (contents, props changed)
subversion/branches/move-tracking-2/COMMITTERS (contents, props changed)
subversion/branches/move-tracking-2/LICENSE (props changed)
subversion/branches/move-tracking-2/NOTICE (props changed)
subversion/branches/move-tracking-2/README (props changed)
subversion/branches/move-tracking-2/TODO (props changed)
subversion/branches/move-tracking-2/aclocal.m4 (props changed)
subversion/branches/move-tracking-2/get-deps.sh (props changed)
subversion/branches/move-tracking-2/subversion/ (props changed)
subversion/branches/move-tracking-2/subversion/bindings/javahl/native/RemoteSession.cpp
subversion/branches/move-tracking-2/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
subversion/branches/move-tracking-2/subversion/include/private/svn_atomic.h
subversion/branches/move-tracking-2/subversion/include/svn_cmdline.h
subversion/branches/move-tracking-2/subversion/include/svn_error.h
subversion/branches/move-tracking-2/subversion/include/svn_error_codes.h
subversion/branches/move-tracking-2/subversion/include/svn_fs.h
subversion/branches/move-tracking-2/subversion/include/svn_ra.h
subversion/branches/move-tracking-2/subversion/include/svn_repos.h
subversion/branches/move-tracking-2/subversion/libsvn_client/merge.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/compat.c
subversion/branches/move-tracking-2/subversion/libsvn_diff/diff_file.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_base/bdb/rev-table.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_base/lock.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/id.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/lock.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/tree.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/verify.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/ (props
changed)
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/fs_id.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/lock.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/tree.c
subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/commit.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/get_file.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/getlocations.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/getlocationsegments.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/lock.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/log.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/mergeinfo.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/replay.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/serf.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/stat.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/util.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_svn/client.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_svn/editorp.c
subversion/branches/move-tracking-2/subversion/libsvn_repos/replay.c
subversion/branches/move-tracking-2/subversion/libsvn_repos/rev_hunt.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/atomic.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/auth.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/error.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/utf8proc/utf8proc.h
subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c
subversion/branches/move-tracking-2/subversion/mod_dav_svn/reports/inherited-props.c
subversion/branches/move-tracking-2/subversion/mod_dav_svn/util.c
subversion/branches/move-tracking-2/subversion/svnserve/serve.c
subversion/branches/move-tracking-2/subversion/tests/cmdline/atomic-ra-revprop-change.c
subversion/branches/move-tracking-2/subversion/tests/cmdline/authz_tests.py
subversion/branches/move-tracking-2/subversion/tests/cmdline/basic_tests.py
subversion/branches/move-tracking-2/subversion/tests/cmdline/davautocheck.sh
subversion/branches/move-tracking-2/subversion/tests/cmdline/externals_tests.py
subversion/branches/move-tracking-2/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/branches/move-tracking-2/subversion/tests/cmdline/move_tests.py
subversion/branches/move-tracking-2/subversion/tests/cmdline/patch_tests.py
subversion/branches/move-tracking-2/subversion/tests/cmdline/prop_tests.py
subversion/branches/move-tracking-2/subversion/tests/cmdline/svnserveautocheck.sh
subversion/branches/move-tracking-2/subversion/tests/cmdline/svntest/main.py
subversion/branches/move-tracking-2/subversion/tests/cmdline/upgrade_tests.py
subversion/branches/move-tracking-2/subversion/tests/cmdline/upgrade_tests_data/wc-without-stat1.tar.bz2
subversion/branches/move-tracking-2/subversion/tests/libsvn_fs/fs-test.c
subversion/branches/move-tracking-2/subversion/tests/libsvn_ra/ra-test.c
subversion/branches/move-tracking-2/subversion/tests/libsvn_subr/auth-test.c
subversion/branches/move-tracking-2/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/move-tracking-2/subversion/tests/svn_test_main.c
subversion/branches/move-tracking-2/tools/ (props changed)
subversion/branches/move-tracking-2/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
subversion/branches/move-tracking-2/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
subversion/branches/move-tracking-2/tools/dev/wc-ng/ (props changed)
Propchange: subversion/branches/move-tracking-2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 16 10:10:20 2015
@@ -88,4 +88,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1606692-1663280,1663281-1665165*
+/subversion/trunk:1606692-1666945
Propchange: subversion/branches/move-tracking-2/BRANCH-README
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Mar 16 10:10:20 2015
@@ -0,0 +1,91 @@
+/subversion/branches/1.5.x-r30215/BRANCH-README:870312
+/subversion/branches/1.7.x-fs-verify/BRANCH-README:1146708,1161180
+/subversion/branches/10Gb/BRANCH-README:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
+/subversion/branches/atomic-revprop/BRANCH-README:965046-1000689
+/subversion/branches/authzperf/BRANCH-README:1615360
+/subversion/branches/auto-props-sdc/BRANCH-README:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/BRANCH-README:872050-872529
+/subversion/branches/cache-server/BRANCH-README:1458643-1476567
+/subversion/branches/diff-callbacks3/BRANCH-README:870059-870761
+/subversion/branches/diff-optimizations/BRANCH-README:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/BRANCH-README:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/BRANCH-README:870728-871118
+/subversion/branches/double-delete/BRANCH-README:870511-872970
+/subversion/branches/dump-load-cross-check/BRANCH-README:1654853-1657295
+/subversion/branches/ev2-export/BRANCH-README:1325914,1332738,1413107
+/subversion/branches/explore-wc/BRANCH-README: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/BRANCH-README:871779-873302
+/subversion/branches/fs-rep-sharing/BRANCH-README:869036-873803
+/subversion/branches/fsfs-format7/BRANCH-README:1426304,1430673,1433848,1438408,1438982,1441129,1442051,1442068,1442504,1442910,1443171,1443803,1444690,1444693,1444695,1445040,1445080,1446103,1451129,1453590,1454307,1460579,1461851,1461865,1462837,1462904,1463120,1467362,1467382,1469487,1471208,1477166,1478055,1481447,1489817,1489949,1490673-1490674,1491784,1493042,1498029,1498103,1498155,1500054,1507729-1507731,1507735-1507736
+/subversion/branches/fsfs-improvements/BRANCH-README:1499981-1547039
+/subversion/branches/fsfs-lock-many/BRANCH-README:1571740-1577217
+/subversion/branches/fsfs-pack/BRANCH-README:873717-874575
+/subversion/branches/fsx/BRANCH-README:1507845-1509914
+/subversion/branches/fsx-id/BRANCH-README:1645603-1649011
+/subversion/branches/gnome-keyring/BRANCH-README:870558-871410
+/subversion/branches/gpg-agent-password-store/BRANCH-README:1005036-1150766
+/subversion/branches/gtest_addition/BRANCH-README:1452117-1502138
+/subversion/branches/http-protocol-v2/BRANCH-README:874395-876041
+/subversion/branches/in-memory-cache/BRANCH-README:869829-871452
+/subversion/branches/in-repo-authz/BRANCH-README:1414342-1424779
+/subversion/branches/inheritable-props/BRANCH-README:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/BRANCH-README:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/BRANCH-README:998649-998852
+/subversion/branches/integrate-compression-level/BRANCH-README:1068651-1072287
+/subversion/branches/integrate-io-improvements/BRANCH-README:1068684-1072297
+/subversion/branches/integrate-is-cachable/BRANCH-README:1072568-1074082
+/subversion/branches/integrate-partial-getter/BRANCH-README:1072558-1076552
+/subversion/branches/integrate-readline-speedup/BRANCH-README:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/BRANCH-README:1068695-1072516
+/subversion/branches/integrate-string-improvements/BRANCH-README:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/BRANCH-README:1072541-1078213
+/subversion/branches/issue-2779-dev/BRANCH-README:965496-984198
+/subversion/branches/issue-2843-dev/BRANCH-README:871432-874179
+/subversion/branches/issue-3000/BRANCH-README:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/BRANCH-README:873375-874084
+/subversion/branches/issue-3148-dev/BRANCH-README:875193-875204
+/subversion/branches/issue-3220-dev/BRANCH-README:872210-872226
+/subversion/branches/issue-3242-dev/BRANCH-README:879653-896436
+/subversion/branches/issue-3334-dirs/BRANCH-README:875156-875867
+/subversion/branches/issue-3975/BRANCH-README:1152931-1160746
+/subversion/branches/issue-4116-dev/BRANCH-README:1424719-1425040
+/subversion/branches/issue-4194-dev/BRANCH-README:1410507-1414880
+/subversion/branches/javahl-ra/BRANCH-README:991978-1494640
+/subversion/branches/kwallet/BRANCH-README:870785-871314
+/subversion/branches/log-addressing/BRANCH-README:1509279-1546844
+/subversion/branches/log-g-performance/BRANCH-README:870941-871032
+/subversion/branches/merge-skips-obstructions/BRANCH-README:874525-874615
+/subversion/branches/multi-layer-moves/BRANCH-README:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/BRANCH-README:870276,870376
+/subversion/branches/node_pool/BRANCH-README:1304828-1305388
+/subversion/branches/performance/BRANCH-README: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,985673,985695,985697,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-1029
340,1029342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/pin-externals/BRANCH-README:1643757-1659392
+/subversion/branches/py-tests-as-modules/BRANCH-README:956579-1033052
+/subversion/branches/ra_serf-digest-authn/BRANCH-README:875693-876404
+/subversion/branches/reintegrate-improvements/BRANCH-README:873853-874164
+/subversion/branches/remote-only-status/BRANCH-README:1581845-1586090
+/subversion/branches/revprop-cache/BRANCH-README:1298521-1326293
+/subversion/branches/revprop-caching-ng/BRANCH-README:1620597,1620599
+/subversion/branches/revprop-packing/BRANCH-README:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/subtree-mergeinfo/BRANCH-README:876734-878766
+/subversion/branches/svn-auth-x509/BRANCH-README:1603509-1655900
+/subversion/branches/svn-info-detail/BRANCH-README:1660035-1662618
+/subversion/branches/svn-mergeinfo-enhancements/BRANCH-README:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/BRANCH-README:918519-934609
+/subversion/branches/svn_mutex/BRANCH-README:1141683-1182099
+/subversion/branches/svnpatch-diff/BRANCH-README:865738-876477
+/subversion/branches/svnraisetc/BRANCH-README:874709-875149
+/subversion/branches/svnserve-logging/BRANCH-README:869828-870893
+/subversion/branches/tc-issue-3334/BRANCH-README:874697-874773
+/subversion/branches/tc-merge-notify/BRANCH-README:874017-874062
+/subversion/branches/tc-resolve/BRANCH-README:874191-874239
+/subversion/branches/tc_url_rev/BRANCH-README:874351-874483
+/subversion/branches/tree-conflicts/BRANCH-README:868291-873154
+/subversion/branches/tree-conflicts-notify/BRANCH-README:873926-874008
+/subversion/branches/tristate-chunked-request/BRANCH-README:1502394-1502681
+/subversion/branches/tweak-build-take-two/BRANCH-README:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/BRANCH-README:1060426-1064427
+/subversion/branches/verify-at-commit/BRANCH-README:1462039-1462408
+/subversion/branches/verify-keep-going/BRANCH-README:1439280-1546110
+/subversion/branches/wc-collate-path/BRANCH-README:1402685-1480384
+/subversion/trunk/BRANCH-README:1606692-1663280
Propchange: subversion/branches/move-tracking-2/BUGS
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Mar 16 10:10:20 2015
@@ -0,0 +1,91 @@
+/subversion/branches/1.5.x-r30215/BUGS:870312
+/subversion/branches/1.7.x-fs-verify/BUGS:1146708,1161180
+/subversion/branches/10Gb/BUGS:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
+/subversion/branches/atomic-revprop/BUGS:965046-1000689
+/subversion/branches/authzperf/BUGS:1615360
+/subversion/branches/auto-props-sdc/BUGS:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/BUGS:872050-872529
+/subversion/branches/cache-server/BUGS:1458643-1476567
+/subversion/branches/diff-callbacks3/BUGS:870059-870761
+/subversion/branches/diff-optimizations/BUGS:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/BUGS:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/BUGS:870728-871118
+/subversion/branches/double-delete/BUGS:870511-872970
+/subversion/branches/dump-load-cross-check/BUGS:1654853-1657295
+/subversion/branches/ev2-export/BUGS:1325914,1332738,1413107
+/subversion/branches/explore-wc/BUGS: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/BUGS:871779-873302
+/subversion/branches/fs-rep-sharing/BUGS:869036-873803
+/subversion/branches/fsfs-format7/BUGS:1426304,1430673,1433848,1438408,1438982,1441129,1442051,1442068,1442504,1442910,1443171,1443803,1444690,1444693,1444695,1445040,1445080,1446103,1451129,1453590,1454307,1460579,1461851,1461865,1462837,1462904,1463120,1467362,1467382,1469487,1471208,1477166,1478055,1481447,1489817,1489949,1490673-1490674,1491784,1493042,1498029,1498103,1498155,1500054,1507729-1507731,1507735-1507736
+/subversion/branches/fsfs-improvements/BUGS:1499981-1547039
+/subversion/branches/fsfs-lock-many/BUGS:1571740-1577217
+/subversion/branches/fsfs-pack/BUGS:873717-874575
+/subversion/branches/fsx/BUGS:1507845-1509914
+/subversion/branches/fsx-id/BUGS:1645603-1649011
+/subversion/branches/gnome-keyring/BUGS:870558-871410
+/subversion/branches/gpg-agent-password-store/BUGS:1005036-1150766
+/subversion/branches/gtest_addition/BUGS:1452117-1502138
+/subversion/branches/http-protocol-v2/BUGS:874395-876041
+/subversion/branches/in-memory-cache/BUGS:869829-871452
+/subversion/branches/in-repo-authz/BUGS:1414342-1424779
+/subversion/branches/inheritable-props/BUGS:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/BUGS:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/BUGS:998649-998852
+/subversion/branches/integrate-compression-level/BUGS:1068651-1072287
+/subversion/branches/integrate-io-improvements/BUGS:1068684-1072297
+/subversion/branches/integrate-is-cachable/BUGS:1072568-1074082
+/subversion/branches/integrate-partial-getter/BUGS:1072558-1076552
+/subversion/branches/integrate-readline-speedup/BUGS:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/BUGS:1068695-1072516
+/subversion/branches/integrate-string-improvements/BUGS:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/BUGS:1072541-1078213
+/subversion/branches/issue-2779-dev/BUGS:965496-984198
+/subversion/branches/issue-2843-dev/BUGS:871432-874179
+/subversion/branches/issue-3000/BUGS:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/BUGS:873375-874084
+/subversion/branches/issue-3148-dev/BUGS:875193-875204
+/subversion/branches/issue-3220-dev/BUGS:872210-872226
+/subversion/branches/issue-3242-dev/BUGS:879653-896436
+/subversion/branches/issue-3334-dirs/BUGS:875156-875867
+/subversion/branches/issue-3975/BUGS:1152931-1160746
+/subversion/branches/issue-4116-dev/BUGS:1424719-1425040
+/subversion/branches/issue-4194-dev/BUGS:1410507-1414880
+/subversion/branches/javahl-ra/BUGS:991978-1494640
+/subversion/branches/kwallet/BUGS:870785-871314
+/subversion/branches/log-addressing/BUGS:1509279-1546844
+/subversion/branches/log-g-performance/BUGS:870941-871032
+/subversion/branches/merge-skips-obstructions/BUGS:874525-874615
+/subversion/branches/multi-layer-moves/BUGS:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/BUGS:870276,870376
+/subversion/branches/node_pool/BUGS:1304828-1305388
+/subversion/branches/performance/BUGS: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,985673,985695,985697,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,10293
42,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/pin-externals/BUGS:1643757-1659392
+/subversion/branches/py-tests-as-modules/BUGS:956579-1033052
+/subversion/branches/ra_serf-digest-authn/BUGS:875693-876404
+/subversion/branches/reintegrate-improvements/BUGS:873853-874164
+/subversion/branches/remote-only-status/BUGS:1581845-1586090
+/subversion/branches/revprop-cache/BUGS:1298521-1326293
+/subversion/branches/revprop-caching-ng/BUGS:1620597,1620599
+/subversion/branches/revprop-packing/BUGS:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/subtree-mergeinfo/BUGS:876734-878766
+/subversion/branches/svn-auth-x509/BUGS:1603509-1655900
+/subversion/branches/svn-info-detail/BUGS:1660035-1662618
+/subversion/branches/svn-mergeinfo-enhancements/BUGS:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/BUGS:918519-934609
+/subversion/branches/svn_mutex/BUGS:1141683-1182099
+/subversion/branches/svnpatch-diff/BUGS:865738-876477
+/subversion/branches/svnraisetc/BUGS:874709-875149
+/subversion/branches/svnserve-logging/BUGS:869828-870893
+/subversion/branches/tc-issue-3334/BUGS:874697-874773
+/subversion/branches/tc-merge-notify/BUGS:874017-874062
+/subversion/branches/tc-resolve/BUGS:874191-874239
+/subversion/branches/tc_url_rev/BUGS:874351-874483
+/subversion/branches/tree-conflicts/BUGS:868291-873154
+/subversion/branches/tree-conflicts-notify/BUGS:873926-874008
+/subversion/branches/tristate-chunked-request/BUGS:1502394-1502681
+/subversion/branches/tweak-build-take-two/BUGS:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/BUGS:1060426-1064427
+/subversion/branches/verify-at-commit/BUGS:1462039-1462408
+/subversion/branches/verify-keep-going/BUGS:1439280-1546110
+/subversion/branches/wc-collate-path/BUGS:1402685-1480384
+/subversion/trunk/BUGS:1606692-1663280
Modified: subversion/branches/move-tracking-2/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/CHANGES?rev=1666947&r1=1666946&r2=1666947&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/CHANGES (original)
+++ subversion/branches/move-tracking-2/CHANGES Mon Mar 16 10:10:20 2015
@@ -16,28 +16,27 @@ http://svn.apache.org/repos/asf/subversi
* svnserve: cache config and authz to lower resource usage and be able to
serve large numbers of connections with a limited number of threads
* membuffer: quadruple the maximum cacheable directory size (r1545948 et
al)
- * new experimental filesystem fsx (faster, smaller)
+ * new filesystem fsx (faster, smaller); experimental - see release notes
- Minor new features and improvements:
* new 'diff-ignore-content-type' runtime configuration option
* new option for 'svnadmin verify': --check-normalization
* new option for 'svnadmin verify': --keep-going
- * svnadmin info: print info about a repository
+ * svnadmin info: new subcommand to print info about a repository
* print summary of conflicts before/after interactive conflict resolution
* import: reduce number of connections to the server needed (r1482962)
* membuffer: rework cache eviction heuristics (r1476664 et at)
* membuffer: improved cache usage statistics (r1489883)
* mergeinfo: new '--log' option (r1492168)
* svnadmin upgrade: progress and cancellation support (r1495545, r1495566)
- * cleanup: add '--remove-unversioned' and '--remove-ignore' (issue #3549)
+ * cleanup: add '--remove-unversioned' and '--remove-ignored' (issue #3549)
* cleanup: add '--include-externals' option (issue #2325)
* cleanup: add '--quiet' option (r1498661)
- * ra_serf: use better transition based XML processing (r1498858 et al)
* svnadmin load: speedup by setting revprops in one call (r1504079)
* svnadmin load: set svn:date revprop in the initial commit (r1504951)
* reimplement UTF-8 fuzzy conversion using utf8proc (r1511676)
* svnadmin verify: speed up for repos with large directories (r1520419)
- * merge: interactive conflict merge option tries external tools (r1524145)
+ * svn merge: interactive conflict resolver tries external tools (r1524145)
* minor speed up in string to time conversion (r1533387)
* windows: speed up console output (r1533994)
* update: optimize wc db usage when obtaining children (r1537065 et al)
@@ -51,7 +50,7 @@ http://svn.apache.org/repos/asf/subversi
* svnserve: reduce connection latency (r1544732)
* wc: reduce the number of locks and transactions required (r1545127 et al)
* cat: add '--ignore-keywords' option (r1547517)
- * merge and mergeinfo: use fewer ra sessions (r1552265)
+ * merge and mergeinfo: use fewer RA sessions (r1552265)
* fsfs: limit delta chains from crossing too many shards (r1554942)
* fsfs: option to configure compression level in deltas (r1559748)
* fsfs: enable dir and prop deltas by default for formats that support
@@ -62,8 +61,8 @@ http://svn.apache.org/repos/asf/subversi
interrupted (r1549907 et al)
* fsfs: speed up transaction creation (r1544719)
* fsfs: avoid trying to open lock digest files that don't exist (r1544721)
- * fsfs: use sorted array instead of hash for directory representation
- internally, this minimizes some overhead (r1554711)
+ * fsfs: reduce internal overhead by using sorted array instead of hash for
+ directory representation (r1554711)
* fsfs: skip decoding txdelta windows that are already cached (r1555284)
* fsfs: avoid constructing fulltext when delta we need is stored (r1555297)
* fsfs: improvements to format 6 reading/writing (r1517479)
@@ -112,7 +111,7 @@ http://svn.apache.org/repos/asf/subversi
* optimize file translation without keyword substitution (r1486058)
* optimize config file parsing by using unbuffered I/O (r1486897)
* patch: apply ignore settings when deciding to delete dirs (r1490378)
- * use a cheaper ra operation for common client calculation (r1496468 et al)
+ * use a cheaper RA operation for common client calculation (r1496468 et al)
* ra_svn: avoid unnecessary work when doing a blame (r1503046)
* optimize reading files into memory if size is known (r1505068)
* copy: do not error on properties when doing a foreign copy (r1563361)
@@ -126,12 +125,12 @@ http://svn.apache.org/repos/asf/subversi
of files (r1570053)
* svnadmin lslocks: add cancellation (r1571992)
* svn --version: list available authentication credential caches (r1572106)
- * improved detection of changes between two nodes, this should reduce the
- number of out of date errors clients see (r1572336)
+ * fs: improved detection of changes between two nodes, this should reduce
+ the number of out of date errors clients see (r1572336)
* allow the use of libmagic to be configured via subversion configuration
file or SVN_CONFIG_OPTION_ENABLE_MAGIC_FILE env variable (r1572916)
* new '--pin-externals' option for svn copy (issue #1258)
- * the '--strict' option was replaced by '--no-newline' (r1662224)
+ * the '--strict' option was renamed '--no-newline' (r1662224)
* merge/update: switch to three-way text conflict markers
(r1591951, r1595522)
* patch: handle renames in git formatted patches (r1594636)
@@ -157,27 +156,28 @@ http://svn.apache.org/repos/asf/subversi
* fsfs: avoid shared data clashes due to multiple distinct repositories
having identical UUIDs (r1618138 et al)
* status: ignore thumbs.db files by default (r1620955)
- * fsfs: harden parsers against data corruption
- (r1622931, r1622937, r1622942)
- * diff: translate files when doing arbitrary diffs (r1623820)
+ * fsfs: harden parsers against data corruption (r1622931, r1622937,
+ r1622942)
+ * diff: respect svn:keywords and svn:eol-style when doing arbitrary
+ diffs (r1623820)
* ra_serf: reduce size of XML generated for reports (r1627333)
* replace generic --trust-server-cert with more specific options to
override specific certificate failures (r1630117 et al)
* commit: improve speed of commits with many files (r1630312 et al)
* svnadmin setrevprop: add '--transaction' option (r1631435)
- * svnadmin delrevprop: add '--transaction' option (r1631435)
+ * svnadmin delrevprop: new subcommand (1592723)
* svnadmin verify: validate the index data against checksums (r1631598)
* cp: improve performance of local copies (r1632284, et al)
- * fsfs: speed up operations that use revision properties
- (r1634875, r1634879)
- * checkout/update: use fewer ra sessions (r1635753 et al)
+ * fsfs: speed up operations that use revision properties (r1634875,
+ r1634879)
+ * checkout/update: use fewer RA sessions (r1635753 et al)
* log: do less work when '--with-no-revprops' is used (r1642231)
* patch: improve command to be more capable as compared to GNU patch
(issue #4533)
* limit server caches to avoid running out of memory if server admin
configured caches largely then they can possibly be on the platform
(r1645572)
- * mod_authz_svn: log implicit read access failures with INFO log level
+ * mod_authz_svn: log implicit read access failures with INFO log level;
Explicit read access failures are still logged with ERROR log level
(r1653032)
* ra_serf: reduce memory usage by removing some extra intermediary state
@@ -192,30 +192,29 @@ http://svn.apache.org/repos/asf/subversi
- Client-side bugfixes:
* export: fix problem exporting symlinks on windows (r1476093)
- * fix no-ascii character handling of command line options (r1476461)
- * convert log to UTF-8 before stripping data after EOF marker (r1476608)
+ * fix non-ascii character handling of command line options (r1476461)
+ * log: strip EOL marker only after converting to UTF-8 (r1476608)
* ra_serf: avoid dropping errors when making a lock request (r1489526)
* ra_serf: fix an error leak in update logic (r1499686)
* windows: fix issues with wcs in symlinked folders (r1501251)
* fix regression that broke parallel nested checkouts (issue #4390)
- * svnmucc: ignore leading r in -r arguments (r1502636)
+ * svnmucc: ignore leading r in revision number arguments to -r (r1502636)
* mkdir: use absolute paths to avoid Windows path length limits (r1516816)
* avoid encoding support code when C runtime doesn't support it (r1530582)
* ra_svn: add check against dirents with path separators (r1533812)
* properly delete temporary files when atomic write fails (r1537466)
- * fix corner cases in move-update tree conflicts (r1538639 et al)
- * fix crash report indentation for x64 reports (r1543589)
+ * wc: fix corner cases in move-update tree conflicts (r1538639 et al)
+ * windows: fix crash report indentation for x64 reports (r1543589)
* mergeinfo: allow to work on a moved target (issue #4301)
* windows: avoid delay when no homedir is available (r1546814)
* status: report externals in a deterministic way (r1550200)
- * copy: avoid an unneeded extra ra session for wc to repo case (r1551564)
+ * copy: avoid an unneeded extra RA session for wc to repo case (r1551564)
* ra_serf: show pre-revprop-change failure on revprop delete (issue #3086)
* svnsync: avoid extra request at end of every revision sync (r1553370)
* ra_serf: fix replace + propset of locked file failures (issue #3674)
* ra_serf: prevent overwriting directory during copy (issue #3314)
* commit: limit number of temporary files open at same time (issue #4172)
* ra_serf: verify incoming integers are really integers (r1557709 et al)
- * wc: reorder two queries to avoid a statement re-prepare (r1558758)
* log: -g --xml doesn't differentiate between forward and reverse merges
(issue #4463)
* windows: improve update and checkout speed (issue #4450)
@@ -225,8 +224,8 @@ http://svn.apache.org/repos/asf/subversi
* ra_svn: use the stream API properly for communications (r1562072)
* update: provide error when none of targets are wcs (r1565388)
* wc: reduce dependence on unspecified SQLite behavior (r1567080 et al)
- * diff: fix diff of directory failing without permissions to read ancester
- directory on server (r1569265, 1569290)
+ * diff: fix diffing directory without permissions to read parent (r1569265,
+ r1569290)
* diff: improve resolving peg revisions (r1570205 et al)
* diff: fix bug in calculating header paths (r1570584)
* ra_serf: add SSL certificate issuers common name to output (r1573728)
@@ -236,42 +235,41 @@ http://svn.apache.org/repos/asf/subversi
* fix problems with read-only authentication caches (issue #4504)
* commit: don't bump just locked files (r1603617)
* log: reduce memory with '-v' (r1604569 et al)
- * diff: fix issuing diffing locally deleted nodes under copied directories
+ * diff: fix diffing locally deleted nodes under copied directories
(r1605832)
* diff: fix missing node error when diffing a replaced node (r1605866)
* propget: forbid using 'show-inherited-properties' with 'strict'
(r1611698)
* windows: avoid delay when user profile isn't writable (r1617926)
- * merge: display the correct node kinds for tree conflicts
- (r1618024, r1619418, r1619717)
- * diff: show properties of a copied dir as diffs against copy not adds
- (r1619380)
+ * merge: display the correct node kinds for tree conflicts (r1618024,
+ r1619418, r1619717)
+ * diff: show properties of a copied dir as diffs against copy, rather than
+ as adds (r1619380)
* diff: show the correct revisions in the header (r1619452)
* diff: fix missing header for files with only property changes (r1619476)
* update: raise a tree conflict rather than an obstruction when an
incoming server-excluded node conflicts with a locally added node
(r1619495)
* update: improve tree conflict reason and action descriptions (r1619777)
- * ra_serf: fix stalls during checkout/update over http(s) (r1621596)
+ * ra_serf: fix stalls during checkout/update over http/https (r1621596)
* svnmucc: don't crash when '--version' is used with other arguments
(r1625496)
- * checkout: report external failures via the exit code as other commands
- already do (r1628398)
- * use the right error code when fputs() fails (r1630369)
+ * checkout: report svn:externals failures via the exit code as other
+ commands already do (r1628398)
+ * svn & svnlook: use the right error code when fputs() fails (r1630369)
* export: reject peg specifiers on local destination path (r1635085)
* don't reject command-line arguments in the form of ".@abc", where
"abc" is a peg specifier that may be empty (r1635118)
* fix directory externals not following history (issue #4529)
* remove 'df' and 'm' options from the interactive conflict resolver for
binary files (r1645578)
- * when parsing mergeinfo allow source path to be empty (issue #4537)
+ * mergeinfo parsing: allow source path to be empty (issue #4537)
* mkdir: when using '--parents' don't add entire contents recursively if
target already exists (r1649951)
* resolve errors with move of a nested delete (r1651980, r1651997)
* update: prevent breaking a working copy when a directory is replaced
with an external to a foreign repository (issue #4550)
* update: prevent an invalid wc state when applying a move (r1652184 et al)
- * resolve: fix a segfault when breaking a move inside a delete
- (issue #4491)
+ * resolve: fix a segfault when breaking a move inside a delete (issue
#4491)
* ra_serf: don't handle a commit that didn't produce a new revision as
a successful commit (r1653532)
* export: fix the lack of notifications when starting to handle externals
@@ -282,10 +280,8 @@ http://svn.apache.org/repos/asf/subversi
* ra_serf: don't abort commits that have already succeeded in some corner
cases (r1659867)
* delete conflict markers of a moved file in the right location (r1660220)
- * fix cases where we don't handle the lack of a configuration file
- properly (r1660369)
- * wc: don't believe there is a copy when doing a foreign repos copy
- (r1660593)
+ * handle lack of a configuration file properly (r1660369)
+ * wc: don't treat foreign repos copy as an intra-repos copy (r1660593)
* upgrade: fix corner cases found in wc upgrades (r1660646 et al)
* update: resolve issues with tree conflicts caused by an incoming
delete removing a mixed revision tree (r1660742)
@@ -296,7 +292,12 @@ http://svn.apache.org/repos/asf/subversi
there used to be a deleted node (r1661664)
* status: display tree conflicts even if the node with the tree conflict is
shadowed by a file (r1662331)
- * entries compatibility: fix with obstructed working copies (r1662412)
+ * pre-1.6 wc compatibility: fix with obstructed working copies (r1662412)
+ * resolve: allow directly resolving tree conflicts (r1658435)
+ * copy: when copying from a wc to a url show all the changes (r1655729)
+ * info: provide results in a stable order (r1662030)
+ * revert: allow depth limited reverts of nodes that only have not-present
+ and/or excluded child nodes (r1662091)
- Server-side bugfixes:
* svnserve: don't ignore socket initialization errors (r1544253)
@@ -317,38 +318,37 @@ http://svn.apache.org/repos/asf/subversi
merging (r1548124)
* mod_dav_svn: always produce an error text even when text specifies
the default message to make diagnosing issues easier (r1553441)
- * mod_dav_svn: fix some pool lifetime issues with err messages (r1553868)
+ * mod_dav_svn: fix some pool lifetime issues with error messages (r1553868)
* mod_dav_svn: avoid setting option headers multiple times (r1557103)
* fsfs: prevent some commits that could cause future corruption (r1560673)
* fsfs: fix a problem verifying pre-1.4 repos used with 1.8 (r1561419)
* fsfs: fix hotcopy for pre-1.4 repositories (r1561427)
- * fix 64-bit underflows in update hit counters (r1567996 et al)
+ * cache: fix premature eviction due to 64-bit underflows (r1567996 et al)
* svnserve: fix potential integer overflow in Cyrus SASL support (r1570434)
* bdb: fix potential integer overflow and underflow (r1570701)
* bdb: prevent silent propogation of some corruption (r1570778)
- * svnadmin delrevprop: new command (1592723)
* svnadmin verify: new option '--metadata-only' (r1593753)
* svnadmin hotcopy: do not corrupt db/current contents when copying old
FSFS repos (r1603485)
* svnadmin hotcopy: don't produce broken copies when a concurrent pack
happens (r1605633)
- * log: reduce memory consumption of '-v' on the server (r1605195)
+ * log: reduce memory consumption of '-v' (r1605195)
* mod_dav_svn: fix performance issue on Windows with named atomics
(r1611379)
- * log: fix a SEGFAULT in handling changed paths (r1615364)
- * mod_dav_svn: Properly forward post lock/unlock failures (r1622235)
+ * log: fix a segfault in handling changed paths (r1615364)
+ * mod_dav_svn: properly forward post-lock/post-unlock failures (r1622235)
* diff: fix handling of depth empty in added directories (r1622024)
* fix a segfault with corrupted changed path lists that try to add root
nodes (r1622944)
* svnadmin verify: report errors nicely rather than possibly aborting
(r1622955)
- * svnlook pget: report transaction name rather than revision number in
+ * svnlook propget: report transaction name rather than revision number in
errors if run with '-t' option (r1623317)
* svnadmin verify: prevent stack overflow conditions in corrupted
repositories (r1623398)
- * svnadmin upgrade: fix an issue that could block an upgraded fsfs format
- 1 or 2 repository from being able to be committed to (r1624011)
- * fix memory lifetime issue in fs backends (r1632646)
+ * fsfs upgrade: fix an issue that could block an upgraded format 1 or 2
+ repository from being committed to (r1624011)
+ * fs backends: fix memory lifetime issue (r1632646)
* bdb: output correct checksum in error message about corruption (r1640707)
* fsfs: fix a pool lifetime error related to transaction local caches
(r1643139, 1643233)
@@ -359,24 +359,19 @@ http://svn.apache.org/repos/asf/subversi
* fsfs: reduce memory use when walking back in history (r1648230)
* dump: remove incorrect kind header on replaced nodes (issue #4553)
* dump: remove duplicate headers for replace-with-copy (issue #4552)
- * mod_dav_svn: don't send non-XML safe characters in svn:author
+ * mod_dav_svn: don't send XML-unsafe characters in svn:author
(issue #4415)
* dump: don't write broken dump files in some ambiguously encoded fsfs
repositories (issue #4554)
* mod_dav_svn: provide a more intuitive error message to the client when
trying to create a directory that already exists (issue #2295)
* fsfs: fix uninitialized memory use in lock/unlock code (r1657525)
- * fix a segfault when executing a pre-commit hook (r1657893)
- * mod_dav_svn: do not ignore errors parsing skels (r1658168)
- * resolve: allow directly resolving tree conflicts (r1658435)
+ * fix a segfault executing a pre-commit hook with legacy locks (r1657893)
+ * mod_dav_svn: do not ignore skel parsing errors (r1658168)
* fsfs: fix multiple reporting of the same lock (r1658482)
* fsfs: fix pool lifetime issue in lock handling (r1659314)
* mod_dav_svn: properly log assertions and malfuctions (r1660480)
* svnadmin load/dump: preserve deletion of svn:date from r0 (issue #4563)
- * copy: when copying from a wc to a url show all the changes (r1655729)
- * info: provide results in a stable order (r1662030)
- * revert: allow depth limited reverts of nodes that only have not-present
- and/or excluded child nodes (r1662091)
- Client-side and server-side bugfixes:
* use less memory when retrieving extension from filename (r1548480)
@@ -413,7 +408,7 @@ http://svn.apache.org/repos/asf/subversi
info, and mergeinfo commands (r1569021)
* new '--conflict-style' option to standalone diff3 tool (r1591750)
* update standalone diff3 tool so it can be used with --diff-cmd
- directly (r1591871, 1591876)
+ directly (r1591871, r1591876)
* bash_completion: support for auth command (r1596841)
* diff: support '-U' option (r1618618)
* svn-rep-sharing-stats: replaced by 'svnfsfs stats' (r1618861)
@@ -435,22 +430,22 @@ http://svn.apache.org/repos/asf/subversi
* include symbolic names for error codes in maintainer mode (r1467643)
* include symbolic names for warning codes in maintainer mode (r1469855)
* support YouCompleteMe vim plugin (r1476374 et al)
- * reduce getenv() call overhead in maintainer mode (r1476554)
+ * cache: add pretend_empty mode for maintainers (r1461689, et al)
* allow tests to be run with exclusive wc locks (r1496475)
* fix check for Microsoft C/C++ compiler (r1503148)
* improve windows build to use pre-built dependencies
* optimize ramdrive usage in the windows test runner (r1504511)
* SVN_CMDLINE_DISABLE_CRASH_HANDLER env var added for Windows (r1506507)
* stop including some headers in win32 resource compile (r1532287)
- * support Visual Studio 2013 with --vsnet-version=2013 (r1533907)
- * avoid needing APR source when building on Windows (r1534037, et al)
+ * gen-make.py: support Visual Studio 2013 by --vsnet-version=2013
(r1533907)
+ * windows: don't require APR source when building (r1534037, et al)
* don't compile SQLite amalgamation twice (r1536364)
* make C tests use same temp path as Python tests (r1536700)
* davautocheck: access log logs the r->filename now (r1538048)
* added test to detect duplicate SQL queries (r1538962)
- * in the windows test runner copy additional apr dlls (r1539300)
+ * windows test runner: copy additional apr dlls (r1539300)
* support for debug logging that should be available in serf 1.4.0
(r1541561)
- * fix build on OS X when Gnome is installed (r1541698)
+ * OS X: fix build when Gnome is installed (r1541698)
* properly detect if expat is libexpat.lib or xml.lib on windows (r1541981)
* doc-clean target works properly with separate build dir (r1542303)
* don't break entire test run if cleaning temp directory failed but return
@@ -522,7 +517,7 @@ http://svn.apache.org/repos/asf/subversi
* new API svn_stringbuf_from_stream() (r1532193)
* svn_auth_get_platform_specific_client_providers() now includes ssl
providers (r1534153)
- * dav_svn_split_uri() repos_path is a fspath with a leading slash
(r1537812)
+ * change dav_svn_split_uri() repos_path argument (r1537812)
* new API svn_repos_fs_type() returns filesystem type (r1538585)
* svn_client__get_inheritable_props() clears wcroot_iprops when revision is
not valid (r1538602)
@@ -531,14 +526,14 @@ http://svn.apache.org/repos/asf/subversi
NULL sentinel value, so compilers can warn when missing (r1543394)
* platform specific svn_auth_get_* functions are deprecated, use the
svn_auth_get_platform_specific_provider() function instead (r1543992)
- * SVN_INT_ERR macro is deprecated use svn_handle_error2() or
+ * SVN_INT_ERR macro is deprecated; use svn_handle_error2() or
svn_cmdline_handle_exit_error() instead (r1544142)
* new API svn_client_cat3() allow disabling keyword expansion and
retrieving
props (r1544182)
* svn_auth_first_credentials(): provides an error rather than crashing if
auth_baton is NULL (r1544320)
* svn_auth_set_parameter(): Do nothing if auth_baton is NULL (r1544320)
- * new api svn_relpath_limit which returns a relpath with a maximum number
+ * new API svn_relpath_limit which returns a relpath with a maximum number
of path components (r1545123)
* svn_fs_initialize() is now threadsafe (r1546409)
* svn_checksum_kind_t has two new FNV-1a checksums (r1546699)
@@ -618,7 +613,7 @@ http://svn.apache.org/repos/asf/subversi
* make svn_io_set_file_read_only() and svn_io_remove_dir2() ignore
ENOTDIR when ignore_enoent argument is set so the behavior is consistent
across platforms (r1653680)
- * make svn_ra_open_session4() return the documented error when a repository
+ * make svn_ra_open4() return the documented error when a repository
should be opened in a different location (r1655648)
* no longer return an error when using svn_ra_get_lock() and the path does
not exist (r1656875)
@@ -636,7 +631,7 @@ http://svn.apache.org/repos/asf/subversi
* javahl: add inheritance info to JavaHL's RevisionRange type (r1499308)
* swig-rb: fixes to building on Windows (1505406 et al)
* libsvn_swig_*libraries now work as proper shared librares (r1506520 et
al)
- * swig-py: import libsvn_subr pub symbols from svn.core * (r1507860)
+ * swig-py: 'import svn.core.*' imports libsvn_subr public symbols
(r1507860)
* javahl: expose the svn_rangelist operations (r1509025)
* javahl: new utility class SVNUtil (r1512354)
* javahl: serialize init of native library (r1519803)
@@ -1097,7 +1092,7 @@ http://svn.apache.org/repos/asf/subversi
* merge: rename 'automatic merge' to 'complete merge' (r1491432)
* mergeinfo: reduce network usage for '--show-revs' (r1492005)
* ra_serf: improve http status handling (r1495104)
- * merge: avoid unneeded ra session (r1493475)
+ * merge: avoid unneeded RA session (r1493475)
* merge: reduce network usage (r1478987)
* merge: remove duplicated ancestry check (r1493424, r1495597)
* ra_serf: fix 'Accept-Encoding' header for IIS interoperability (r1497551)
Propchange: subversion/branches/move-tracking-2/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 16 10:10:20 2015
@@ -86,4 +86,4 @@
/subversion/branches/verify-at-commit/CHANGES:1462039-1462408
/subversion/branches/verify-keep-going/CHANGES:1439280-1546110
/subversion/branches/wc-collate-path/CHANGES:1402685-1480384
-/subversion/trunk/CHANGES:1606692-1665165
+/subversion/trunk/CHANGES:1606692-1666945
Modified: subversion/branches/move-tracking-2/COMMITTERS
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/COMMITTERS?rev=1666947&r1=1666946&r2=1666947&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/COMMITTERS [UTF-8] (original)
+++ subversion/branches/move-tracking-2/COMMITTERS [UTF-8] Mon Mar 16 10:10:20
2015
@@ -51,7 +51,7 @@ Blanket commit access:
rhuijben Bert Huijben <[email protected]>
stylesen Senthil Kumaran S <[email protected]>
steveking Stefan Küng <[email protected]>
- neels Neels J. Hofmeyr <[email protected]>
+ neels Neels J. Hofmeyr <[email protected]>
jwhitlock Jeremy Whitlock <[email protected]>
sbutler Stephen Butler <[email protected]>
dannas Daniel Näslund <[email protected]>
Propchange: subversion/branches/move-tracking-2/COMMITTERS
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 16 10:10:20 2015
@@ -82,4 +82,4 @@
/subversion/branches/verify-at-commit/COMMITTERS:1462039-1462408
/subversion/branches/verify-keep-going/COMMITTERS:1439280-1546110
/subversion/branches/wc-collate-path/COMMITTERS:1402685-1480384
-/subversion/trunk/COMMITTERS:1606692-1658451
+/subversion/trunk/COMMITTERS:1606692-1666945
Propchange: subversion/branches/move-tracking-2/LICENSE
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Mar 16 10:10:20 2015
@@ -0,0 +1,91 @@
+/subversion/branches/1.5.x-r30215/LICENSE:870312
+/subversion/branches/1.7.x-fs-verify/LICENSE:1146708,1161180
+/subversion/branches/10Gb/LICENSE:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
+/subversion/branches/atomic-revprop/LICENSE:965046-1000689
+/subversion/branches/authzperf/LICENSE:1615360
+/subversion/branches/auto-props-sdc/LICENSE:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/LICENSE:872050-872529
+/subversion/branches/cache-server/LICENSE:1458643-1476567
+/subversion/branches/diff-callbacks3/LICENSE:870059-870761
+/subversion/branches/diff-optimizations/LICENSE:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/LICENSE:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/LICENSE:870728-871118
+/subversion/branches/double-delete/LICENSE:870511-872970
+/subversion/branches/dump-load-cross-check/LICENSE:1654853-1657295
+/subversion/branches/ev2-export/LICENSE:1325914,1332738,1413107
+/subversion/branches/explore-wc/LICENSE: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/LICENSE:871779-873302
+/subversion/branches/fs-rep-sharing/LICENSE:869036-873803
+/subversion/branches/fsfs-format7/LICENSE:1426304,1430673,1433848,1438408,1438982,1441129,1442051,1442068,1442504,1442910,1443171,1443803,1444690,1444693,1444695,1445040,1445080,1446103,1451129,1453590,1454307,1460579,1461851,1461865,1462837,1462904,1463120,1467362,1467382,1469487,1471208,1477166,1478055,1481447,1489817,1489949,1490673-1490674,1491784,1493042,1498029,1498103,1498155,1500054,1507729-1507731,1507735-1507736
+/subversion/branches/fsfs-improvements/LICENSE:1499981-1547039
+/subversion/branches/fsfs-lock-many/LICENSE:1571740-1577217
+/subversion/branches/fsfs-pack/LICENSE:873717-874575
+/subversion/branches/fsx/LICENSE:1507845-1509914
+/subversion/branches/fsx-id/LICENSE:1645603-1649011
+/subversion/branches/gnome-keyring/LICENSE:870558-871410
+/subversion/branches/gpg-agent-password-store/LICENSE:1005036-1150766
+/subversion/branches/gtest_addition/LICENSE:1452117-1502138
+/subversion/branches/http-protocol-v2/LICENSE:874395-876041
+/subversion/branches/in-memory-cache/LICENSE:869829-871452
+/subversion/branches/in-repo-authz/LICENSE:1414342-1424779
+/subversion/branches/inheritable-props/LICENSE:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/LICENSE:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/LICENSE:998649-998852
+/subversion/branches/integrate-compression-level/LICENSE:1068651-1072287
+/subversion/branches/integrate-io-improvements/LICENSE:1068684-1072297
+/subversion/branches/integrate-is-cachable/LICENSE:1072568-1074082
+/subversion/branches/integrate-partial-getter/LICENSE:1072558-1076552
+/subversion/branches/integrate-readline-speedup/LICENSE:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/LICENSE:1068695-1072516
+/subversion/branches/integrate-string-improvements/LICENSE:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/LICENSE:1072541-1078213
+/subversion/branches/issue-2779-dev/LICENSE:965496-984198
+/subversion/branches/issue-2843-dev/LICENSE:871432-874179
+/subversion/branches/issue-3000/LICENSE:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/LICENSE:873375-874084
+/subversion/branches/issue-3148-dev/LICENSE:875193-875204
+/subversion/branches/issue-3220-dev/LICENSE:872210-872226
+/subversion/branches/issue-3242-dev/LICENSE:879653-896436
+/subversion/branches/issue-3334-dirs/LICENSE:875156-875867
+/subversion/branches/issue-3975/LICENSE:1152931-1160746
+/subversion/branches/issue-4116-dev/LICENSE:1424719-1425040
+/subversion/branches/issue-4194-dev/LICENSE:1410507-1414880
+/subversion/branches/javahl-ra/LICENSE:991978-1494640
+/subversion/branches/kwallet/LICENSE:870785-871314
+/subversion/branches/log-addressing/LICENSE:1509279-1546844
+/subversion/branches/log-g-performance/LICENSE:870941-871032
+/subversion/branches/merge-skips-obstructions/LICENSE:874525-874615
+/subversion/branches/multi-layer-moves/LICENSE:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/LICENSE:870276,870376
+/subversion/branches/node_pool/LICENSE:1304828-1305388
+/subversion/branches/performance/LICENSE: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,985673,985695,985697,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,10
29342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/pin-externals/LICENSE:1643757-1659392
+/subversion/branches/py-tests-as-modules/LICENSE:956579-1033052
+/subversion/branches/ra_serf-digest-authn/LICENSE:875693-876404
+/subversion/branches/reintegrate-improvements/LICENSE:873853-874164
+/subversion/branches/remote-only-status/LICENSE:1581845-1586090
+/subversion/branches/revprop-cache/LICENSE:1298521-1326293
+/subversion/branches/revprop-caching-ng/LICENSE:1620597,1620599
+/subversion/branches/revprop-packing/LICENSE:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/subtree-mergeinfo/LICENSE:876734-878766
+/subversion/branches/svn-auth-x509/LICENSE:1603509-1655900
+/subversion/branches/svn-info-detail/LICENSE:1660035-1662618
+/subversion/branches/svn-mergeinfo-enhancements/LICENSE:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/LICENSE:918519-934609
+/subversion/branches/svn_mutex/LICENSE:1141683-1182099
+/subversion/branches/svnpatch-diff/LICENSE:865738-876477
+/subversion/branches/svnraisetc/LICENSE:874709-875149
+/subversion/branches/svnserve-logging/LICENSE:869828-870893
+/subversion/branches/tc-issue-3334/LICENSE:874697-874773
+/subversion/branches/tc-merge-notify/LICENSE:874017-874062
+/subversion/branches/tc-resolve/LICENSE:874191-874239
+/subversion/branches/tc_url_rev/LICENSE:874351-874483
+/subversion/branches/tree-conflicts/LICENSE:868291-873154
+/subversion/branches/tree-conflicts-notify/LICENSE:873926-874008
+/subversion/branches/tristate-chunked-request/LICENSE:1502394-1502681
+/subversion/branches/tweak-build-take-two/LICENSE:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/LICENSE:1060426-1064427
+/subversion/branches/verify-at-commit/LICENSE:1462039-1462408
+/subversion/branches/verify-keep-going/LICENSE:1439280-1546110
+/subversion/branches/wc-collate-path/LICENSE:1402685-1480384
+/subversion/trunk/LICENSE:1606692-1663280
Propchange: subversion/branches/move-tracking-2/NOTICE
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Mar 16 10:10:20 2015
@@ -0,0 +1,91 @@
+/subversion/branches/1.5.x-r30215/NOTICE:870312
+/subversion/branches/1.7.x-fs-verify/NOTICE:1146708,1161180
+/subversion/branches/10Gb/NOTICE:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
+/subversion/branches/atomic-revprop/NOTICE:965046-1000689
+/subversion/branches/authzperf/NOTICE:1615360
+/subversion/branches/auto-props-sdc/NOTICE:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/NOTICE:872050-872529
+/subversion/branches/cache-server/NOTICE:1458643-1476567
+/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/dump-load-cross-check/NOTICE:1654853-1657295
+/subversion/branches/ev2-export/NOTICE:1325914,1332738,1413107
+/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-format7/NOTICE:1426304,1430673,1433848,1438408,1438982,1441129,1442051,1442068,1442504,1442910,1443171,1443803,1444690,1444693,1444695,1445040,1445080,1446103,1451129,1453590,1454307,1460579,1461851,1461865,1462837,1462904,1463120,1467362,1467382,1469487,1471208,1477166,1478055,1481447,1489817,1489949,1490673-1490674,1491784,1493042,1498029,1498103,1498155,1500054,1507729-1507731,1507735-1507736
+/subversion/branches/fsfs-improvements/NOTICE:1499981-1547039
+/subversion/branches/fsfs-lock-many/NOTICE:1571740-1577217
+/subversion/branches/fsfs-pack/NOTICE:873717-874575
+/subversion/branches/fsx/NOTICE:1507845-1509914
+/subversion/branches/fsx-id/NOTICE:1645603-1649011
+/subversion/branches/gnome-keyring/NOTICE:870558-871410
+/subversion/branches/gpg-agent-password-store/NOTICE:1005036-1150766
+/subversion/branches/gtest_addition/NOTICE:1452117-1502138
+/subversion/branches/http-protocol-v2/NOTICE:874395-876041
+/subversion/branches/in-memory-cache/NOTICE:869829-871452
+/subversion/branches/in-repo-authz/NOTICE:1414342-1424779
+/subversion/branches/inheritable-props/NOTICE:1297080-1395089
+/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-string-improvements/NOTICE:1068251-1190617
+/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/issue-4116-dev/NOTICE:1424719-1425040
+/subversion/branches/issue-4194-dev/NOTICE:1410507-1414880
+/subversion/branches/javahl-ra/NOTICE:991978-1494640
+/subversion/branches/kwallet/NOTICE:870785-871314
+/subversion/branches/log-addressing/NOTICE:1509279-1546844
+/subversion/branches/log-g-performance/NOTICE:870941-871032
+/subversion/branches/merge-skips-obstructions/NOTICE:874525-874615
+/subversion/branches/multi-layer-moves/NOTICE:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/NOTICE:870276,870376
+/subversion/branches/node_pool/NOTICE:1304828-1305388
+/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,985673,985695,985697,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,102
9342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/pin-externals/NOTICE:1643757-1659392
+/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/remote-only-status/NOTICE:1581845-1586090
+/subversion/branches/revprop-cache/NOTICE:1298521-1326293
+/subversion/branches/revprop-caching-ng/NOTICE:1620597,1620599
+/subversion/branches/revprop-packing/NOTICE:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/subtree-mergeinfo/NOTICE:876734-878766
+/subversion/branches/svn-auth-x509/NOTICE:1603509-1655900
+/subversion/branches/svn-info-detail/NOTICE:1660035-1662618
+/subversion/branches/svn-mergeinfo-enhancements/NOTICE:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/NOTICE:918519-934609
+/subversion/branches/svn_mutex/NOTICE:1141683-1182099
+/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/tristate-chunked-request/NOTICE:1502394-1502681
+/subversion/branches/tweak-build-take-two/NOTICE:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/NOTICE:1060426-1064427
+/subversion/branches/verify-at-commit/NOTICE:1462039-1462408
+/subversion/branches/verify-keep-going/NOTICE:1439280-1546110
+/subversion/branches/wc-collate-path/NOTICE:1402685-1480384
+/subversion/trunk/NOTICE:1606692-1663280
Propchange: subversion/branches/move-tracking-2/README
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Mar 16 10:10:20 2015
@@ -0,0 +1,91 @@
+/subversion/branches/1.5.x-r30215/README:870312
+/subversion/branches/1.7.x-fs-verify/README:1146708,1161180
+/subversion/branches/10Gb/README:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
+/subversion/branches/atomic-revprop/README:965046-1000689
+/subversion/branches/authzperf/README:1615360
+/subversion/branches/auto-props-sdc/README:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/README:872050-872529
+/subversion/branches/cache-server/README:1458643-1476567
+/subversion/branches/diff-callbacks3/README:870059-870761
+/subversion/branches/diff-optimizations/README:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/README:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/README:870728-871118
+/subversion/branches/double-delete/README:870511-872970
+/subversion/branches/dump-load-cross-check/README:1654853-1657295
+/subversion/branches/ev2-export/README:1325914,1332738,1413107
+/subversion/branches/explore-wc/README: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/README:871779-873302
+/subversion/branches/fs-rep-sharing/README:869036-873803
+/subversion/branches/fsfs-format7/README:1426304,1430673,1433848,1438408,1438982,1441129,1442051,1442068,1442504,1442910,1443171,1443803,1444690,1444693,1444695,1445040,1445080,1446103,1451129,1453590,1454307,1460579,1461851,1461865,1462837,1462904,1463120,1467362,1467382,1469487,1471208,1477166,1478055,1481447,1489817,1489949,1490673-1490674,1491784,1493042,1498029,1498103,1498155,1500054,1507729-1507731,1507735-1507736
+/subversion/branches/fsfs-improvements/README:1499981-1547039
+/subversion/branches/fsfs-lock-many/README:1571740-1577217
+/subversion/branches/fsfs-pack/README:873717-874575
+/subversion/branches/fsx/README:1507845-1509914
+/subversion/branches/fsx-id/README:1645603-1649011
+/subversion/branches/gnome-keyring/README:870558-871410
+/subversion/branches/gpg-agent-password-store/README:1005036-1150766
+/subversion/branches/gtest_addition/README:1452117-1502138
+/subversion/branches/http-protocol-v2/README:874395-876041
+/subversion/branches/in-memory-cache/README:869829-871452
+/subversion/branches/in-repo-authz/README:1414342-1424779
+/subversion/branches/inheritable-props/README:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/README:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/README:998649-998852
+/subversion/branches/integrate-compression-level/README:1068651-1072287
+/subversion/branches/integrate-io-improvements/README:1068684-1072297
+/subversion/branches/integrate-is-cachable/README:1072568-1074082
+/subversion/branches/integrate-partial-getter/README:1072558-1076552
+/subversion/branches/integrate-readline-speedup/README:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/README:1068695-1072516
+/subversion/branches/integrate-string-improvements/README:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/README:1072541-1078213
+/subversion/branches/issue-2779-dev/README:965496-984198
+/subversion/branches/issue-2843-dev/README:871432-874179
+/subversion/branches/issue-3000/README:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/README:873375-874084
+/subversion/branches/issue-3148-dev/README:875193-875204
+/subversion/branches/issue-3220-dev/README:872210-872226
+/subversion/branches/issue-3242-dev/README:879653-896436
+/subversion/branches/issue-3334-dirs/README:875156-875867
+/subversion/branches/issue-3975/README:1152931-1160746
+/subversion/branches/issue-4116-dev/README:1424719-1425040
+/subversion/branches/issue-4194-dev/README:1410507-1414880
+/subversion/branches/javahl-ra/README:991978-1494640
+/subversion/branches/kwallet/README:870785-871314
+/subversion/branches/log-addressing/README:1509279-1546844
+/subversion/branches/log-g-performance/README:870941-871032
+/subversion/branches/merge-skips-obstructions/README:874525-874615
+/subversion/branches/multi-layer-moves/README:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/README:870276,870376
+/subversion/branches/node_pool/README:1304828-1305388
+/subversion/branches/performance/README: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,985673,985695,985697,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,102
9342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/pin-externals/README:1643757-1659392
+/subversion/branches/py-tests-as-modules/README:956579-1033052
+/subversion/branches/ra_serf-digest-authn/README:875693-876404
+/subversion/branches/reintegrate-improvements/README:873853-874164
+/subversion/branches/remote-only-status/README:1581845-1586090
+/subversion/branches/revprop-cache/README:1298521-1326293
+/subversion/branches/revprop-caching-ng/README:1620597,1620599
+/subversion/branches/revprop-packing/README:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/subtree-mergeinfo/README:876734-878766
+/subversion/branches/svn-auth-x509/README:1603509-1655900
+/subversion/branches/svn-info-detail/README:1660035-1662618
+/subversion/branches/svn-mergeinfo-enhancements/README:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/README:918519-934609
+/subversion/branches/svn_mutex/README:1141683-1182099
+/subversion/branches/svnpatch-diff/README:865738-876477
+/subversion/branches/svnraisetc/README:874709-875149
+/subversion/branches/svnserve-logging/README:869828-870893
+/subversion/branches/tc-issue-3334/README:874697-874773
+/subversion/branches/tc-merge-notify/README:874017-874062
+/subversion/branches/tc-resolve/README:874191-874239
+/subversion/branches/tc_url_rev/README:874351-874483
+/subversion/branches/tree-conflicts/README:868291-873154
+/subversion/branches/tree-conflicts-notify/README:873926-874008
+/subversion/branches/tristate-chunked-request/README:1502394-1502681
+/subversion/branches/tweak-build-take-two/README:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/README:1060426-1064427
+/subversion/branches/verify-at-commit/README:1462039-1462408
+/subversion/branches/verify-keep-going/README:1439280-1546110
+/subversion/branches/wc-collate-path/README:1402685-1480384
+/subversion/trunk/README:1606692-1663280
Propchange: subversion/branches/move-tracking-2/TODO
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Mar 16 10:10:20 2015
@@ -0,0 +1,91 @@
+/subversion/branches/1.5.x-r30215/TODO:870312
+/subversion/branches/1.7.x-fs-verify/TODO:1146708,1161180
+/subversion/branches/10Gb/TODO:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
+/subversion/branches/atomic-revprop/TODO:965046-1000689
+/subversion/branches/authzperf/TODO:1615360
+/subversion/branches/auto-props-sdc/TODO:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/TODO:872050-872529
+/subversion/branches/cache-server/TODO:1458643-1476567
+/subversion/branches/diff-callbacks3/TODO:870059-870761
+/subversion/branches/diff-optimizations/TODO:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/TODO:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/TODO:870728-871118
+/subversion/branches/double-delete/TODO:870511-872970
+/subversion/branches/dump-load-cross-check/TODO:1654853-1657295
+/subversion/branches/ev2-export/TODO:1325914,1332738,1413107
+/subversion/branches/explore-wc/TODO: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/TODO:871779-873302
+/subversion/branches/fs-rep-sharing/TODO:869036-873803
+/subversion/branches/fsfs-format7/TODO:1426304,1430673,1433848,1438408,1438982,1441129,1442051,1442068,1442504,1442910,1443171,1443803,1444690,1444693,1444695,1445040,1445080,1446103,1451129,1453590,1454307,1460579,1461851,1461865,1462837,1462904,1463120,1467362,1467382,1469487,1471208,1477166,1478055,1481447,1489817,1489949,1490673-1490674,1491784,1493042,1498029,1498103,1498155,1500054,1507729-1507731,1507735-1507736
+/subversion/branches/fsfs-improvements/TODO:1499981-1547039
+/subversion/branches/fsfs-lock-many/TODO:1571740-1577217
+/subversion/branches/fsfs-pack/TODO:873717-874575
+/subversion/branches/fsx/TODO:1507845-1509914
+/subversion/branches/fsx-id/TODO:1645603-1649011
+/subversion/branches/gnome-keyring/TODO:870558-871410
+/subversion/branches/gpg-agent-password-store/TODO:1005036-1150766
+/subversion/branches/gtest_addition/TODO:1452117-1502138
+/subversion/branches/http-protocol-v2/TODO:874395-876041
+/subversion/branches/in-memory-cache/TODO:869829-871452
+/subversion/branches/in-repo-authz/TODO:1414342-1424779
+/subversion/branches/inheritable-props/TODO:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/TODO:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/TODO:998649-998852
+/subversion/branches/integrate-compression-level/TODO:1068651-1072287
+/subversion/branches/integrate-io-improvements/TODO:1068684-1072297
+/subversion/branches/integrate-is-cachable/TODO:1072568-1074082
+/subversion/branches/integrate-partial-getter/TODO:1072558-1076552
+/subversion/branches/integrate-readline-speedup/TODO:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/TODO:1068695-1072516
+/subversion/branches/integrate-string-improvements/TODO:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/TODO:1072541-1078213
+/subversion/branches/issue-2779-dev/TODO:965496-984198
+/subversion/branches/issue-2843-dev/TODO:871432-874179
+/subversion/branches/issue-3000/TODO:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/TODO:873375-874084
+/subversion/branches/issue-3148-dev/TODO:875193-875204
+/subversion/branches/issue-3220-dev/TODO:872210-872226
+/subversion/branches/issue-3242-dev/TODO:879653-896436
+/subversion/branches/issue-3334-dirs/TODO:875156-875867
+/subversion/branches/issue-3975/TODO:1152931-1160746
+/subversion/branches/issue-4116-dev/TODO:1424719-1425040
+/subversion/branches/issue-4194-dev/TODO:1410507-1414880
+/subversion/branches/javahl-ra/TODO:991978-1494640
+/subversion/branches/kwallet/TODO:870785-871314
+/subversion/branches/log-addressing/TODO:1509279-1546844
+/subversion/branches/log-g-performance/TODO:870941-871032
+/subversion/branches/merge-skips-obstructions/TODO:874525-874615
+/subversion/branches/multi-layer-moves/TODO:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/TODO:870276,870376
+/subversion/branches/node_pool/TODO:1304828-1305388
+/subversion/branches/performance/TODO: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,985673,985695,985697,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,10293
42,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/pin-externals/TODO:1643757-1659392
+/subversion/branches/py-tests-as-modules/TODO:956579-1033052
+/subversion/branches/ra_serf-digest-authn/TODO:875693-876404
+/subversion/branches/reintegrate-improvements/TODO:873853-874164
+/subversion/branches/remote-only-status/TODO:1581845-1586090
+/subversion/branches/revprop-cache/TODO:1298521-1326293
+/subversion/branches/revprop-caching-ng/TODO:1620597,1620599
+/subversion/branches/revprop-packing/TODO:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/subtree-mergeinfo/TODO:876734-878766
+/subversion/branches/svn-auth-x509/TODO:1603509-1655900
+/subversion/branches/svn-info-detail/TODO:1660035-1662618
+/subversion/branches/svn-mergeinfo-enhancements/TODO:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/TODO:918519-934609
+/subversion/branches/svn_mutex/TODO:1141683-1182099
+/subversion/branches/svnpatch-diff/TODO:865738-876477
+/subversion/branches/svnraisetc/TODO:874709-875149
+/subversion/branches/svnserve-logging/TODO:869828-870893
+/subversion/branches/tc-issue-3334/TODO:874697-874773
+/subversion/branches/tc-merge-notify/TODO:874017-874062
+/subversion/branches/tc-resolve/TODO:874191-874239
+/subversion/branches/tc_url_rev/TODO:874351-874483
+/subversion/branches/tree-conflicts/TODO:868291-873154
+/subversion/branches/tree-conflicts-notify/TODO:873926-874008
+/subversion/branches/tristate-chunked-request/TODO:1502394-1502681
+/subversion/branches/tweak-build-take-two/TODO:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/TODO:1060426-1064427
+/subversion/branches/verify-at-commit/TODO:1462039-1462408
+/subversion/branches/verify-keep-going/TODO:1439280-1546110
+/subversion/branches/wc-collate-path/TODO:1402685-1480384
+/subversion/trunk/TODO:1606692-1663280