Author: julianfoad
Date: Mon Oct 27 17:28:13 2014
New Revision: 1634609
URL: http://svn.apache.org/r1634609
Log:
On the 'move-tracking-2' branch: catch up with trunk@1634606.
Added:
subversion/branches/move-tracking-2/subversion/include/private/svn_fs_fs_private.h
- copied unchanged from r1634606,
subversion/trunk/subversion/include/private/svn_fs_fs_private.h
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/dump-index.c
- copied unchanged from r1634606,
subversion/trunk/subversion/libsvn_fs_fs/dump-index.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/load-index.c
- copied unchanged from r1634606,
subversion/trunk/subversion/libsvn_fs_fs/load-index.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/stats.c
- copied unchanged from r1634606,
subversion/trunk/subversion/libsvn_fs_fs/stats.c
subversion/branches/move-tracking-2/subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test.c
- copied unchanged from r1634606,
subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test.c
subversion/branches/move-tracking-2/subversion/tests/libsvn_fs_fs/fs-fs-private-test.c
- copied unchanged from r1634606,
subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-private-test.c
subversion/branches/move-tracking-2/tools/client-side/svn-vendor.py
- copied unchanged from r1634606,
subversion/trunk/tools/client-side/svn-vendor.py
Removed:
subversion/branches/move-tracking-2/subversion/include/private/svn_named_atomic.h
subversion/branches/move-tracking-2/subversion/libsvn_subr/named_atomic.c
subversion/branches/move-tracking-2/subversion/svn-bench/client_errors.h
subversion/branches/move-tracking-2/subversion/svn/client_errors.h
subversion/branches/move-tracking-2/subversion/tests/libsvn_subr/named_atomic-test-common.h
subversion/branches/move-tracking-2/subversion/tests/libsvn_subr/named_atomic-test-proc.c
subversion/branches/move-tracking-2/subversion/tests/libsvn_subr/named_atomic-test.c
subversion/branches/move-tracking-2/tools/client-side/showchange.pl
Modified:
subversion/branches/move-tracking-2/ (props changed)
subversion/branches/move-tracking-2/COMMITTERS (contents, props changed)
subversion/branches/move-tracking-2/autogen.sh (contents, props changed)
subversion/branches/move-tracking-2/build/ (props changed)
subversion/branches/move-tracking-2/build.conf (contents, props changed)
subversion/branches/move-tracking-2/build/buildcheck.sh
subversion/branches/move-tracking-2/configure.ac (contents, props changed)
subversion/branches/move-tracking-2/notes/ (props changed)
subversion/branches/move-tracking-2/notes/knobs
subversion/branches/move-tracking-2/subversion/ (props changed)
subversion/branches/move-tracking-2/subversion/include/private/svn_dep_compat.h
subversion/branches/move-tracking-2/subversion/include/svn_client.h
subversion/branches/move-tracking-2/subversion/include/svn_cmdline.h
subversion/branches/move-tracking-2/subversion/include/svn_delta.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_io.h
subversion/branches/move-tracking-2/subversion/include/svn_string.h
subversion/branches/move-tracking-2/subversion/include/svn_wc.h
subversion/branches/move-tracking-2/subversion/libsvn_client/commit.c
subversion/branches/move-tracking-2/subversion/libsvn_client/copy.c
subversion/branches/move-tracking-2/subversion/libsvn_client/diff_local.c
subversion/branches/move-tracking-2/subversion/libsvn_client/externals.c
subversion/branches/move-tracking-2/subversion/libsvn_client/import.c
subversion/branches/move-tracking-2/subversion/libsvn_client/mtcc.c
subversion/branches/move-tracking-2/subversion/libsvn_client/relocate.c
subversion/branches/move-tracking-2/subversion/libsvn_client/upgrade.c
subversion/branches/move-tracking-2/subversion/libsvn_client/util.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/debug_editor.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/text_delta.c
subversion/branches/move-tracking-2/subversion/libsvn_fs/fs-loader.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_base/bdb/changes-table.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_base/fs.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/cached_data.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/caching.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/fs.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/fs.h
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/fs_fs.h
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/hotcopy.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/id.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/id.h
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/index.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/index.h
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/lock.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/low_level.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/low_level.h
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/pack.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/recovery.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/rev_file.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/rev_file.h
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/revprops.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/revprops.h
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/structure
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/structure-indexes
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/temp_serializer.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/transaction.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/tree.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/util.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/util.h
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/cached_data.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/caching.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/fs.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/fs.h
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/fs_x.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/hotcopy.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/index.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/noderevs.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/pack.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/recovery.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/revprops.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/revprops.h
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/transaction.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/verify.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/blame.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/commit.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/get_lock.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/merge.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/xml.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_svn/client.c
subversion/branches/move-tracking-2/subversion/libsvn_repos/dump.c
subversion/branches/move-tracking-2/subversion/libsvn_repos/replay.c
subversion/branches/move-tracking-2/subversion/libsvn_repos/repos.c
subversion/branches/move-tracking-2/subversion/libsvn_repos/rev_hunt.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/cache-inprocess.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/cmdline.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/deprecated.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/gpg_agent.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/io.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/packed_data.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/path.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/stream.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/string.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/subst.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/sysinfo.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/adm_ops.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/cleanup.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/copy.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/deprecated.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/externals.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/node.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/wc.h
subversion/branches/move-tracking-2/subversion/libsvn_wc/wc_db.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/wc_db.h
subversion/branches/move-tracking-2/subversion/libsvn_wc/workqueue.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/workqueue.h
subversion/branches/move-tracking-2/subversion/mod_dav_svn/deadprops.c
subversion/branches/move-tracking-2/subversion/mod_dav_svn/lock.c
subversion/branches/move-tracking-2/subversion/mod_dav_svn/util.c
subversion/branches/move-tracking-2/subversion/svn-bench/cl.h
subversion/branches/move-tracking-2/subversion/svn-bench/svn-bench.c
subversion/branches/move-tracking-2/subversion/svn/auth-cmd.c
subversion/branches/move-tracking-2/subversion/svn/checkout-cmd.c
subversion/branches/move-tracking-2/subversion/svn/cl.h
subversion/branches/move-tracking-2/subversion/svn/svn.c
subversion/branches/move-tracking-2/subversion/svn/util.c
subversion/branches/move-tracking-2/subversion/svnadmin/svnadmin.c
subversion/branches/move-tracking-2/subversion/svnfsfs/dump-index-cmd.c
subversion/branches/move-tracking-2/subversion/svnfsfs/load-index-cmd.c
subversion/branches/move-tracking-2/subversion/svnfsfs/stats-cmd.c
subversion/branches/move-tracking-2/subversion/svnfsfs/svnfsfs.c
subversion/branches/move-tracking-2/subversion/svnfsfs/svnfsfs.h
subversion/branches/move-tracking-2/subversion/svnlook/svnlook.c
subversion/branches/move-tracking-2/subversion/svnmucc/svnmucc.c
subversion/branches/move-tracking-2/subversion/svnrdump/svnrdump.c
subversion/branches/move-tracking-2/subversion/svnsync/svnsync.c
subversion/branches/move-tracking-2/subversion/tests/cmdline/basic_tests.py
subversion/branches/move-tracking-2/subversion/tests/cmdline/externals_tests.py
subversion/branches/move-tracking-2/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
subversion/branches/move-tracking-2/subversion/tests/cmdline/lock_tests.py
subversion/branches/move-tracking-2/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/move-tracking-2/subversion/tests/cmdline/switch_tests.py
subversion/branches/move-tracking-2/subversion/tests/libsvn_fs/fs-test.c
subversion/branches/move-tracking-2/subversion/tests/libsvn_fs_fs/ (props
changed)
subversion/branches/move-tracking-2/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
subversion/branches/move-tracking-2/subversion/tests/libsvn_fs_x/ (props
changed)
subversion/branches/move-tracking-2/subversion/tests/libsvn_fs_x/fs-x-pack-test.c
subversion/branches/move-tracking-2/subversion/tests/libsvn_subr/io-test.c
subversion/branches/move-tracking-2/subversion/tests/libsvn_subr/skel-test.c
subversion/branches/move-tracking-2/subversion/tests/libsvn_wc/wc-test.c
subversion/branches/move-tracking-2/subversion/tests/svn_test.h
subversion/branches/move-tracking-2/subversion/tests/svn_test_fs.c
subversion/branches/move-tracking-2/subversion/tests/svn_test_fs.h
subversion/branches/move-tracking-2/tools/ (props changed)
subversion/branches/move-tracking-2/tools/client-side/bash_completion
subversion/branches/move-tracking-2/tools/dev/fsfs-access-map.c
subversion/branches/move-tracking-2/tools/dev/unix-build/Makefile.svn
subversion/branches/move-tracking-2/tools/server-side/svnpredumpfilter.py
Propchange: subversion/branches/move-tracking-2/
------------------------------------------------------------------------------
Merged /subversion/branches/revprop-caching-ng:r1620597,1620599
Merged /subversion/trunk:r1622194-1634606
Modified: subversion/branches/move-tracking-2/COMMITTERS
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/COMMITTERS?rev=1634609&r1=1634608&r2=1634609&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/COMMITTERS [UTF-8] (original)
+++ subversion/branches/move-tracking-2/COMMITTERS [UTF-8] Mon Oct 27 17:28:13
2014
@@ -98,6 +98,8 @@ Commit access for specific areas:
sage Sage LaTorra <sag...@gmail.com> (Ctypes-Python b.)
vmpn Vladimir Berezniker <v...@hitechman.com> (JavaHL bindings)
rschupp Roderich Schupp <roderich.sch...@gmail.com> (Swig bindings)
+ stilor Alexey Neyman <sti...@att.net> (Python bindings,
+ svn-vendor.py)
Packages:
Propchange: subversion/branches/move-tracking-2/COMMITTERS
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 17:28:13 2014
@@ -0,0 +1,85 @@
+/subversion/branches/1.5.x-r30215/COMMITTERS:870312
+/subversion/branches/1.7.x-fs-verify/COMMITTERS:1146708,1161180
+/subversion/branches/10Gb/COMMITTERS: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/COMMITTERS:965046-1000689
+/subversion/branches/authzperf/COMMITTERS:1615360
+/subversion/branches/auto-props-sdc/COMMITTERS:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/COMMITTERS:872050-872529
+/subversion/branches/cache-server/COMMITTERS:1458643-1476567
+/subversion/branches/diff-callbacks3/COMMITTERS:870059-870761
+/subversion/branches/diff-optimizations/COMMITTERS:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/COMMITTERS:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/COMMITTERS:870728-871118
+/subversion/branches/double-delete/COMMITTERS:870511-872970
+/subversion/branches/ev2-export/COMMITTERS:1325914,1332738,1413107
+/subversion/branches/explore-wc/COMMITTERS: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/COMMITTERS:871779-873302
+/subversion/branches/fs-rep-sharing/COMMITTERS:869036-873803
+/subversion/branches/fsfs-format7/COMMITTERS: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/COMMITTERS:1499981-1547039
+/subversion/branches/fsfs-lock-many/COMMITTERS:1571740-1577217
+/subversion/branches/fsfs-pack/COMMITTERS:873717-874575
+/subversion/branches/fsx/COMMITTERS:1507845-1509914
+/subversion/branches/gnome-keyring/COMMITTERS:870558-871410
+/subversion/branches/gpg-agent-password-store/COMMITTERS:1005036-1150766
+/subversion/branches/gtest_addition/COMMITTERS:1452117-1502138
+/subversion/branches/http-protocol-v2/COMMITTERS:874395-876041
+/subversion/branches/in-memory-cache/COMMITTERS:869829-871452
+/subversion/branches/in-repo-authz/COMMITTERS:1414342-1424779
+/subversion/branches/inheritable-props/COMMITTERS:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/COMMITTERS:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/COMMITTERS:998649-998852
+/subversion/branches/integrate-compression-level/COMMITTERS:1068651-1072287
+/subversion/branches/integrate-io-improvements/COMMITTERS:1068684-1072297
+/subversion/branches/integrate-is-cachable/COMMITTERS:1072568-1074082
+/subversion/branches/integrate-partial-getter/COMMITTERS:1072558-1076552
+/subversion/branches/integrate-readline-speedup/COMMITTERS:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/COMMITTERS:1068695-1072516
+/subversion/branches/integrate-string-improvements/COMMITTERS:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/COMMITTERS:1072541-1078213
+/subversion/branches/issue-2779-dev/COMMITTERS:965496-984198
+/subversion/branches/issue-2843-dev/COMMITTERS:871432-874179
+/subversion/branches/issue-3000/COMMITTERS:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/COMMITTERS:873375-874084
+/subversion/branches/issue-3148-dev/COMMITTERS:875193-875204
+/subversion/branches/issue-3220-dev/COMMITTERS:872210-872226
+/subversion/branches/issue-3242-dev/COMMITTERS:879653-896436
+/subversion/branches/issue-3334-dirs/COMMITTERS:875156-875867
+/subversion/branches/issue-3975/COMMITTERS:1152931-1160746
+/subversion/branches/issue-4116-dev/COMMITTERS:1424719-1425040
+/subversion/branches/issue-4194-dev/COMMITTERS:1410507-1414880
+/subversion/branches/javahl-ra/COMMITTERS:991978-1494640
+/subversion/branches/kwallet/COMMITTERS:870785-871314
+/subversion/branches/log-addressing/COMMITTERS:1509279-1546844
+/subversion/branches/log-g-performance/COMMITTERS:870941-871032
+/subversion/branches/merge-skips-obstructions/COMMITTERS:874525-874615
+/subversion/branches/multi-layer-moves/COMMITTERS:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/COMMITTERS:870276,870376
+/subversion/branches/node_pool/COMMITTERS:1304828-1305388
+/subversion/branches/performance/COMMITTERS: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
,1029342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/py-tests-as-modules/COMMITTERS:956579-1033052
+/subversion/branches/ra_serf-digest-authn/COMMITTERS:875693-876404
+/subversion/branches/reintegrate-improvements/COMMITTERS:873853-874164
+/subversion/branches/remote-only-status/COMMITTERS:1581845-1586090
+/subversion/branches/revprop-cache/COMMITTERS:1298521-1326293
+/subversion/branches/revprop-packing/COMMITTERS:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/subtree-mergeinfo/COMMITTERS:876734-878766
+/subversion/branches/svn-mergeinfo-enhancements/COMMITTERS:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/COMMITTERS:918519-934609
+/subversion/branches/svn_mutex/COMMITTERS:1141683-1182099
+/subversion/branches/svnpatch-diff/COMMITTERS:865738-876477
+/subversion/branches/svnraisetc/COMMITTERS:874709-875149
+/subversion/branches/svnserve-logging/COMMITTERS:869828-870893
+/subversion/branches/tc-issue-3334/COMMITTERS:874697-874773
+/subversion/branches/tc-merge-notify/COMMITTERS:874017-874062
+/subversion/branches/tc-resolve/COMMITTERS:874191-874239
+/subversion/branches/tc_url_rev/COMMITTERS:874351-874483
+/subversion/branches/tree-conflicts/COMMITTERS:868291-873154
+/subversion/branches/tree-conflicts-notify/COMMITTERS:873926-874008
+/subversion/branches/tristate-chunked-request/COMMITTERS:1502394-1502681
+/subversion/branches/tweak-build-take-two/COMMITTERS:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/COMMITTERS:1060426-1064427
+/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-1634606
Modified: subversion/branches/move-tracking-2/autogen.sh
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/autogen.sh?rev=1634609&r1=1634608&r2=1634609&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/autogen.sh (original)
+++ subversion/branches/move-tracking-2/autogen.sh Mon Oct 27 17:28:13 2014
@@ -59,7 +59,8 @@ done
# ### APR's libtool. deferring to a second round of change...
#
-libtoolize="`./build/PrintPath glibtoolize libtoolize libtoolize15`"
+# Much like APR except we do not prefer libtool 1 over libtool 2.
+libtoolize="`./build/PrintPath glibtoolize libtoolize glibtoolize1
libtoolize15 libtoolize14`"
lt_major_version=`$libtoolize --version 2>/dev/null | sed -e 's/^[^0-9]*//' -e
's/\..*//' -e '/^$/d' -e 1q`
if [ "x$libtoolize" = "x" ]; then
Propchange: subversion/branches/move-tracking-2/autogen.sh
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 17:28:13 2014
@@ -0,0 +1,85 @@
+/subversion/branches/1.5.x-r30215/autogen.sh:870312
+/subversion/branches/1.7.x-fs-verify/autogen.sh:1146708,1161180
+/subversion/branches/10Gb/autogen.sh: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/autogen.sh:965046-1000689
+/subversion/branches/authzperf/autogen.sh:1615360
+/subversion/branches/auto-props-sdc/autogen.sh:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/autogen.sh:872050-872529
+/subversion/branches/cache-server/autogen.sh:1458643-1476567
+/subversion/branches/diff-callbacks3/autogen.sh:870059-870761
+/subversion/branches/diff-optimizations/autogen.sh:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/autogen.sh:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/autogen.sh:870728-871118
+/subversion/branches/double-delete/autogen.sh:870511-872970
+/subversion/branches/ev2-export/autogen.sh:1325914,1332738,1413107
+/subversion/branches/explore-wc/autogen.sh: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/autogen.sh:871779-873302
+/subversion/branches/fs-rep-sharing/autogen.sh:869036-873803
+/subversion/branches/fsfs-format7/autogen.sh: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/autogen.sh:1499981-1547039
+/subversion/branches/fsfs-lock-many/autogen.sh:1571740-1577217
+/subversion/branches/fsfs-pack/autogen.sh:873717-874575
+/subversion/branches/fsx/autogen.sh:1507845-1509914
+/subversion/branches/gnome-keyring/autogen.sh:870558-871410
+/subversion/branches/gpg-agent-password-store/autogen.sh:1005036-1150766
+/subversion/branches/gtest_addition/autogen.sh:1452117-1502138
+/subversion/branches/http-protocol-v2/autogen.sh:874395-876041
+/subversion/branches/in-memory-cache/autogen.sh:869829-871452
+/subversion/branches/in-repo-authz/autogen.sh:1414342-1424779
+/subversion/branches/inheritable-props/autogen.sh:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/autogen.sh:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/autogen.sh:998649-998852
+/subversion/branches/integrate-compression-level/autogen.sh:1068651-1072287
+/subversion/branches/integrate-io-improvements/autogen.sh:1068684-1072297
+/subversion/branches/integrate-is-cachable/autogen.sh:1072568-1074082
+/subversion/branches/integrate-partial-getter/autogen.sh:1072558-1076552
+/subversion/branches/integrate-readline-speedup/autogen.sh:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/autogen.sh:1068695-1072516
+/subversion/branches/integrate-string-improvements/autogen.sh:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/autogen.sh:1072541-1078213
+/subversion/branches/issue-2779-dev/autogen.sh:965496-984198
+/subversion/branches/issue-2843-dev/autogen.sh:871432-874179
+/subversion/branches/issue-3000/autogen.sh:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/autogen.sh:873375-874084
+/subversion/branches/issue-3148-dev/autogen.sh:875193-875204
+/subversion/branches/issue-3220-dev/autogen.sh:872210-872226
+/subversion/branches/issue-3242-dev/autogen.sh:879653-896436
+/subversion/branches/issue-3334-dirs/autogen.sh:875156-875867
+/subversion/branches/issue-3975/autogen.sh:1152931-1160746
+/subversion/branches/issue-4116-dev/autogen.sh:1424719-1425040
+/subversion/branches/issue-4194-dev/autogen.sh:1410507-1414880
+/subversion/branches/javahl-ra/autogen.sh:991978-1494640
+/subversion/branches/kwallet/autogen.sh:870785-871314
+/subversion/branches/log-addressing/autogen.sh:1509279-1546844
+/subversion/branches/log-g-performance/autogen.sh:870941-871032
+/subversion/branches/merge-skips-obstructions/autogen.sh:874525-874615
+/subversion/branches/multi-layer-moves/autogen.sh:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/autogen.sh:870276,870376
+/subversion/branches/node_pool/autogen.sh:1304828-1305388
+/subversion/branches/performance/autogen.sh: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
,1029342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/py-tests-as-modules/autogen.sh:956579-1033052
+/subversion/branches/ra_serf-digest-authn/autogen.sh:875693-876404
+/subversion/branches/reintegrate-improvements/autogen.sh:873853-874164
+/subversion/branches/remote-only-status/autogen.sh:1581845-1586090
+/subversion/branches/revprop-cache/autogen.sh:1298521-1326293
+/subversion/branches/revprop-packing/autogen.sh:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/subtree-mergeinfo/autogen.sh:876734-878766
+/subversion/branches/svn-mergeinfo-enhancements/autogen.sh:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/autogen.sh:918519-934609
+/subversion/branches/svn_mutex/autogen.sh:1141683-1182099
+/subversion/branches/svnpatch-diff/autogen.sh:865738-876477
+/subversion/branches/svnraisetc/autogen.sh:874709-875149
+/subversion/branches/svnserve-logging/autogen.sh:869828-870893
+/subversion/branches/tc-issue-3334/autogen.sh:874697-874773
+/subversion/branches/tc-merge-notify/autogen.sh:874017-874062
+/subversion/branches/tc-resolve/autogen.sh:874191-874239
+/subversion/branches/tc_url_rev/autogen.sh:874351-874483
+/subversion/branches/tree-conflicts/autogen.sh:868291-873154
+/subversion/branches/tree-conflicts-notify/autogen.sh:873926-874008
+/subversion/branches/tristate-chunked-request/autogen.sh:1502394-1502681
+/subversion/branches/tweak-build-take-two/autogen.sh:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/autogen.sh:1060426-1064427
+/subversion/branches/verify-at-commit/autogen.sh:1462039-1462408
+/subversion/branches/verify-keep-going/autogen.sh:1439280-1546110
+/subversion/branches/wc-collate-path/autogen.sh:1402685-1480384
+/subversion/trunk/autogen.sh:1606692-1634606
Propchange: subversion/branches/move-tracking-2/build/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 17:28:13 2014
@@ -0,0 +1,85 @@
+/subversion/branches/1.5.x-r30215/build:870312
+/subversion/branches/1.7.x-fs-verify/build:1146708,1161180
+/subversion/branches/10Gb/build: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/build:965046-1000689
+/subversion/branches/authzperf/build:1615360
+/subversion/branches/auto-props-sdc/build:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/build:872050-872529
+/subversion/branches/cache-server/build:1458643-1476567
+/subversion/branches/diff-callbacks3/build:870059-870761
+/subversion/branches/diff-optimizations/build:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/build:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/build:870728-871118
+/subversion/branches/double-delete/build:870511-872970
+/subversion/branches/ev2-export/build:1325914,1332738,1413107
+/subversion/branches/explore-wc/build: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/build:871779-873302
+/subversion/branches/fs-rep-sharing/build:869036-873803
+/subversion/branches/fsfs-format7/build: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/build:1499981-1547039
+/subversion/branches/fsfs-lock-many/build:1571740-1577217
+/subversion/branches/fsfs-pack/build:873717-874575
+/subversion/branches/fsx/build:1507845-1509914
+/subversion/branches/gnome-keyring/build:870558-871410
+/subversion/branches/gpg-agent-password-store/build:1005036-1150766
+/subversion/branches/gtest_addition/build:1452117-1502138
+/subversion/branches/http-protocol-v2/build:874395-876041
+/subversion/branches/in-memory-cache/build:869829-871452
+/subversion/branches/in-repo-authz/build:1414342-1424779
+/subversion/branches/inheritable-props/build:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/build:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/build:998649-998852
+/subversion/branches/integrate-compression-level/build:1068651-1072287
+/subversion/branches/integrate-io-improvements/build:1068684-1072297
+/subversion/branches/integrate-is-cachable/build:1072568-1074082
+/subversion/branches/integrate-partial-getter/build:1072558-1076552
+/subversion/branches/integrate-readline-speedup/build:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/build:1068695-1072516
+/subversion/branches/integrate-string-improvements/build:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/build:1072541-1078213
+/subversion/branches/issue-2779-dev/build:965496-984198
+/subversion/branches/issue-2843-dev/build:871432-874179
+/subversion/branches/issue-3000/build:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/build:873375-874084
+/subversion/branches/issue-3148-dev/build:875193-875204
+/subversion/branches/issue-3220-dev/build:872210-872226
+/subversion/branches/issue-3242-dev/build:879653-896436
+/subversion/branches/issue-3334-dirs/build:875156-875867
+/subversion/branches/issue-3975/build:1152931-1160746
+/subversion/branches/issue-4116-dev/build:1424719-1425040
+/subversion/branches/issue-4194-dev/build:1410507-1414880
+/subversion/branches/javahl-ra/build:991978-1494640
+/subversion/branches/kwallet/build:870785-871314
+/subversion/branches/log-addressing/build:1509279-1546844
+/subversion/branches/log-g-performance/build:870941-871032
+/subversion/branches/merge-skips-obstructions/build:874525-874615
+/subversion/branches/multi-layer-moves/build:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/build:870276,870376
+/subversion/branches/node_pool/build:1304828-1305388
+/subversion/branches/performance/build: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,1029
342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/py-tests-as-modules/build:956579-1033052
+/subversion/branches/ra_serf-digest-authn/build:875693-876404
+/subversion/branches/reintegrate-improvements/build:873853-874164
+/subversion/branches/remote-only-status/build:1581845-1586090
+/subversion/branches/revprop-cache/build:1298521-1326293
+/subversion/branches/revprop-packing/build:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/subtree-mergeinfo/build:876734-878766
+/subversion/branches/svn-mergeinfo-enhancements/build:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/build:918519-934609
+/subversion/branches/svn_mutex/build:1141683-1182099
+/subversion/branches/svnpatch-diff/build:865738-876477
+/subversion/branches/svnraisetc/build:874709-875149
+/subversion/branches/svnserve-logging/build:869828-870893
+/subversion/branches/tc-issue-3334/build:874697-874773
+/subversion/branches/tc-merge-notify/build:874017-874062
+/subversion/branches/tc-resolve/build:874191-874239
+/subversion/branches/tc_url_rev/build:874351-874483
+/subversion/branches/tree-conflicts/build:868291-873154
+/subversion/branches/tree-conflicts-notify/build:873926-874008
+/subversion/branches/tristate-chunked-request/build:1502394-1502681
+/subversion/branches/tweak-build-take-two/build:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/build:1060426-1064427
+/subversion/branches/verify-at-commit/build:1462039-1462408
+/subversion/branches/verify-keep-going/build:1439280-1546110
+/subversion/branches/wc-collate-path/build:1402685-1480384
+/subversion/trunk/build:1606692-1634606
Modified: subversion/branches/move-tracking-2/build.conf
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/build.conf?rev=1634609&r1=1634608&r2=1634609&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/build.conf (original)
+++ subversion/branches/move-tracking-2/build.conf Mon Oct 27 17:28:13 2014
@@ -390,7 +390,7 @@ msvc-export =
private\svn_temp_serializer.h private\svn_io_private.h
private\svn_sorts_private.h
private\svn_string_private.h private\svn_magic.h
- private\svn_subr_private.h private\svn_mutex.h
private\svn_named_atomic.h
+ private\svn_subr_private.h private\svn_mutex.h
private\svn_packed_data.h private\svn_object_pool.h private\svn_cert.h
# Working copy management lib
@@ -818,6 +818,24 @@ install = test
libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta
libsvn_subr apriconv apr
+[fs-fs-fuzzy-test]
+description = Use fuzzying to test FSFS corruption resilience
+type = exe
+path = subversion/tests/libsvn_fs_fs
+sources = fs-fs-fuzzy-test.c
+install = sub-test
+libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta
+ libsvn_repos libsvn_subr apriconv apr
+
+[fs-fs-private-test]
+description = Test FSSF private API
+type = exe
+path = subversion/tests/libsvn_fs_fs
+sources = fs-fs-private-test.c
+install = test
+libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta
+ libsvn_repos libsvn_subr apriconv apr
+
# ----------------------------------------------------------------------------
# Tests for libsvn_fs_x
[fs-x-pack-test]
@@ -994,22 +1012,6 @@ sources = mergeinfo-test.c
install = test
libs = libsvn_test libsvn_subr apr
-[named_atomic-test]
-description = Test named atomics
-type = exe
-path = subversion/tests/libsvn_subr
-sources = named_atomic-test.c
-install = test
-libs = libsvn_test libsvn_subr apr
-
-[named_atomic-proc-test]
-description = Sub-process for named atomics
-type = exe
-path = subversion/tests/libsvn_subr
-sources = named_atomic-test-proc.c
-install = sub-test
-libs = libsvn_subr apr
-
[packed-data-test]
description = Test path library
type = exe
@@ -1472,8 +1474,8 @@ libs = svn svnadmin svndumpfilter svnloo
type = project
path = build/win32
libs = __ALL__
- fs-test fs-base-test fs-fsfs-test fs-fs-pack-test fs-x-pack-test
- string-table-test
+ fs-test fs-base-test fs-fsfs-test fs-fs-pack-test fs-fs-fuzzy-test
+ fs-fs-private-test fs-x-pack-test string-table-test
skel-test strings-reps-test changes-test locks-test
repos-test dump-load-test
checksum-test compat-test config-test hashdump-test mergeinfo-test
@@ -1481,7 +1483,7 @@ libs = __ALL__
priority-queue-test root-pools-test stream-test
string-test time-test utf-test bit-array-test
error-test error-code-test cache-test spillbuf-test crypto-test
- named_atomic-test named_atomic-proc-test revision-test
+ revision-test
subst_translate-test io-test
translate-test
random-test window-test
Propchange: subversion/branches/move-tracking-2/build.conf
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 17:28:13 2014
@@ -0,0 +1,85 @@
+/subversion/branches/1.5.x-r30215/build.conf:870312
+/subversion/branches/1.7.x-fs-verify/build.conf:1146708,1161180
+/subversion/branches/10Gb/build.conf: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/build.conf:965046-1000689
+/subversion/branches/authzperf/build.conf:1615360
+/subversion/branches/auto-props-sdc/build.conf:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/build.conf:872050-872529
+/subversion/branches/cache-server/build.conf:1458643-1476567
+/subversion/branches/diff-callbacks3/build.conf:870059-870761
+/subversion/branches/diff-optimizations/build.conf:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/build.conf:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/build.conf:870728-871118
+/subversion/branches/double-delete/build.conf:870511-872970
+/subversion/branches/ev2-export/build.conf:1325914,1332738,1413107
+/subversion/branches/explore-wc/build.conf: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/build.conf:871779-873302
+/subversion/branches/fs-rep-sharing/build.conf:869036-873803
+/subversion/branches/fsfs-format7/build.conf: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/build.conf:1499981-1547039
+/subversion/branches/fsfs-lock-many/build.conf:1571740-1577217
+/subversion/branches/fsfs-pack/build.conf:873717-874575
+/subversion/branches/fsx/build.conf:1507845-1509914
+/subversion/branches/gnome-keyring/build.conf:870558-871410
+/subversion/branches/gpg-agent-password-store/build.conf:1005036-1150766
+/subversion/branches/gtest_addition/build.conf:1452117-1502138
+/subversion/branches/http-protocol-v2/build.conf:874395-876041
+/subversion/branches/in-memory-cache/build.conf:869829-871452
+/subversion/branches/in-repo-authz/build.conf:1414342-1424779
+/subversion/branches/inheritable-props/build.conf:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/build.conf:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/build.conf:998649-998852
+/subversion/branches/integrate-compression-level/build.conf:1068651-1072287
+/subversion/branches/integrate-io-improvements/build.conf:1068684-1072297
+/subversion/branches/integrate-is-cachable/build.conf:1072568-1074082
+/subversion/branches/integrate-partial-getter/build.conf:1072558-1076552
+/subversion/branches/integrate-readline-speedup/build.conf:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/build.conf:1068695-1072516
+/subversion/branches/integrate-string-improvements/build.conf:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/build.conf:1072541-1078213
+/subversion/branches/issue-2779-dev/build.conf:965496-984198
+/subversion/branches/issue-2843-dev/build.conf:871432-874179
+/subversion/branches/issue-3000/build.conf:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/build.conf:873375-874084
+/subversion/branches/issue-3148-dev/build.conf:875193-875204
+/subversion/branches/issue-3220-dev/build.conf:872210-872226
+/subversion/branches/issue-3242-dev/build.conf:879653-896436
+/subversion/branches/issue-3334-dirs/build.conf:875156-875867
+/subversion/branches/issue-3975/build.conf:1152931-1160746
+/subversion/branches/issue-4116-dev/build.conf:1424719-1425040
+/subversion/branches/issue-4194-dev/build.conf:1410507-1414880
+/subversion/branches/javahl-ra/build.conf:991978-1494640
+/subversion/branches/kwallet/build.conf:870785-871314
+/subversion/branches/log-addressing/build.conf:1509279-1546844
+/subversion/branches/log-g-performance/build.conf:870941-871032
+/subversion/branches/merge-skips-obstructions/build.conf:874525-874615
+/subversion/branches/multi-layer-moves/build.conf:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/build.conf:870276,870376
+/subversion/branches/node_pool/build.conf:1304828-1305388
+/subversion/branches/performance/build.conf: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
,1029342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/py-tests-as-modules/build.conf:956579-1033052
+/subversion/branches/ra_serf-digest-authn/build.conf:875693-876404
+/subversion/branches/reintegrate-improvements/build.conf:873853-874164
+/subversion/branches/remote-only-status/build.conf:1581845-1586090
+/subversion/branches/revprop-cache/build.conf:1298521-1326293
+/subversion/branches/revprop-packing/build.conf:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/subtree-mergeinfo/build.conf:876734-878766
+/subversion/branches/svn-mergeinfo-enhancements/build.conf:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/build.conf:918519-934609
+/subversion/branches/svn_mutex/build.conf:1141683-1182099
+/subversion/branches/svnpatch-diff/build.conf:865738-876477
+/subversion/branches/svnraisetc/build.conf:874709-875149
+/subversion/branches/svnserve-logging/build.conf:869828-870893
+/subversion/branches/tc-issue-3334/build.conf:874697-874773
+/subversion/branches/tc-merge-notify/build.conf:874017-874062
+/subversion/branches/tc-resolve/build.conf:874191-874239
+/subversion/branches/tc_url_rev/build.conf:874351-874483
+/subversion/branches/tree-conflicts/build.conf:868291-873154
+/subversion/branches/tree-conflicts-notify/build.conf:873926-874008
+/subversion/branches/tristate-chunked-request/build.conf:1502394-1502681
+/subversion/branches/tweak-build-take-two/build.conf:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/build.conf:1060426-1064427
+/subversion/branches/verify-at-commit/build.conf:1462039-1462408
+/subversion/branches/verify-keep-going/build.conf:1439280-1546110
+/subversion/branches/wc-collate-path/build.conf:1402685-1480384
+/subversion/trunk/build.conf:1606692-1634606
Modified: subversion/branches/move-tracking-2/build/buildcheck.sh
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/build/buildcheck.sh?rev=1634609&r1=1634608&r2=1634609&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/build/buildcheck.sh (original)
+++ subversion/branches/move-tracking-2/build/buildcheck.sh Mon Oct 27 17:28:13
2014
@@ -97,14 +97,15 @@ else
esac
fi
-libtool=${LIBTOOL:-`./build/PrintPath glibtool libtool libtool15`}
+# Much like APR except we do not prefer libtool 1 over libtool 2.
+libtoolize=${LIBTOOLIZE:-`./build/PrintPath glibtoolize libtoolize
glibtoolize1 libtoolize15 libtoolize14`}
# Extract the libtool version number: everything from the first number in
# the version text until a hyphen or space.
-lt_pversion=`$libtool --version 2>/dev/null |
+lt_pversion=`$libtoolize --version 2>/dev/null |
sed -e 's/^[^0-9]*//' -e 's/[- ].*//' -e '/^$/d' |
sed -e 1q`
if test -z "$lt_pversion"; then
- echo "buildcheck: libtool not found."
+ echo "buildcheck: libtoolize not found."
echo " You need libtool version $LIBTOOL_WANTED_VERSION or newer
installed"
exit 1
fi
Modified: subversion/branches/move-tracking-2/configure.ac
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/configure.ac?rev=1634609&r1=1634608&r2=1634609&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/configure.ac (original)
+++ subversion/branches/move-tracking-2/configure.ac Mon Oct 27 17:28:13 2014
@@ -319,18 +319,6 @@ case $host in
esac
AC_SUBST(LT_NO_UNDEFINED)
-AC_MSG_CHECKING([whether to avoid circular linkage at all costs])
-case $host in
- *-*-cygwin*)
- AC_MSG_RESULT([yes])
- AC_DEFINE([SVN_AVOID_CIRCULAR_LINKAGE_AT_ALL_COSTS_HACK], 1,
- [Define if circular linkage is not possible on this platform.])
- ;;
- *)
- AC_MSG_RESULT([no])
- ;;
-esac
-
dnl Check for trang.
trang=yes
AC_ARG_WITH(trang,
Propchange: subversion/branches/move-tracking-2/configure.ac
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 17:28:13 2014
@@ -0,0 +1,85 @@
+/subversion/branches/1.5.x-r30215/configure.ac:870312
+/subversion/branches/1.7.x-fs-verify/configure.ac:1146708,1161180
+/subversion/branches/10Gb/configure.ac: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/configure.ac:965046-1000689
+/subversion/branches/authzperf/configure.ac:1615360
+/subversion/branches/auto-props-sdc/configure.ac:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/configure.ac:872050-872529
+/subversion/branches/cache-server/configure.ac:1458643-1476567
+/subversion/branches/diff-callbacks3/configure.ac:870059-870761
+/subversion/branches/diff-optimizations/configure.ac:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/configure.ac:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/configure.ac:870728-871118
+/subversion/branches/double-delete/configure.ac:870511-872970
+/subversion/branches/ev2-export/configure.ac:1325914,1332738,1413107
+/subversion/branches/explore-wc/configure.ac: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/configure.ac:871779-873302
+/subversion/branches/fs-rep-sharing/configure.ac:869036-873803
+/subversion/branches/fsfs-format7/configure.ac: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/configure.ac:1499981-1547039
+/subversion/branches/fsfs-lock-many/configure.ac:1571740-1577217
+/subversion/branches/fsfs-pack/configure.ac:873717-874575
+/subversion/branches/fsx/configure.ac:1507845-1509914
+/subversion/branches/gnome-keyring/configure.ac:870558-871410
+/subversion/branches/gpg-agent-password-store/configure.ac:1005036-1150766
+/subversion/branches/gtest_addition/configure.ac:1452117-1502138
+/subversion/branches/http-protocol-v2/configure.ac:874395-876041
+/subversion/branches/in-memory-cache/configure.ac:869829-871452
+/subversion/branches/in-repo-authz/configure.ac:1414342-1424779
+/subversion/branches/inheritable-props/configure.ac:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/configure.ac:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/configure.ac:998649-998852
+/subversion/branches/integrate-compression-level/configure.ac:1068651-1072287
+/subversion/branches/integrate-io-improvements/configure.ac:1068684-1072297
+/subversion/branches/integrate-is-cachable/configure.ac:1072568-1074082
+/subversion/branches/integrate-partial-getter/configure.ac:1072558-1076552
+/subversion/branches/integrate-readline-speedup/configure.ac:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/configure.ac:1068695-1072516
+/subversion/branches/integrate-string-improvements/configure.ac:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/configure.ac:1072541-1078213
+/subversion/branches/issue-2779-dev/configure.ac:965496-984198
+/subversion/branches/issue-2843-dev/configure.ac:871432-874179
+/subversion/branches/issue-3000/configure.ac:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/configure.ac:873375-874084
+/subversion/branches/issue-3148-dev/configure.ac:875193-875204
+/subversion/branches/issue-3220-dev/configure.ac:872210-872226
+/subversion/branches/issue-3242-dev/configure.ac:879653-896436
+/subversion/branches/issue-3334-dirs/configure.ac:875156-875867
+/subversion/branches/issue-3975/configure.ac:1152931-1160746
+/subversion/branches/issue-4116-dev/configure.ac:1424719-1425040
+/subversion/branches/issue-4194-dev/configure.ac:1410507-1414880
+/subversion/branches/javahl-ra/configure.ac:991978-1494640
+/subversion/branches/kwallet/configure.ac:870785-871314
+/subversion/branches/log-addressing/configure.ac:1509279-1546844
+/subversion/branches/log-g-performance/configure.ac:870941-871032
+/subversion/branches/merge-skips-obstructions/configure.ac:874525-874615
+/subversion/branches/multi-layer-moves/configure.ac:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/configure.ac:870276,870376
+/subversion/branches/node_pool/configure.ac:1304828-1305388
+/subversion/branches/performance/configure.ac: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-10293
40,1029342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/py-tests-as-modules/configure.ac:956579-1033052
+/subversion/branches/ra_serf-digest-authn/configure.ac:875693-876404
+/subversion/branches/reintegrate-improvements/configure.ac:873853-874164
+/subversion/branches/remote-only-status/configure.ac:1581845-1586090
+/subversion/branches/revprop-cache/configure.ac:1298521-1326293
+/subversion/branches/revprop-packing/configure.ac:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/subtree-mergeinfo/configure.ac:876734-878766
+/subversion/branches/svn-mergeinfo-enhancements/configure.ac:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/configure.ac:918519-934609
+/subversion/branches/svn_mutex/configure.ac:1141683-1182099
+/subversion/branches/svnpatch-diff/configure.ac:865738-876477
+/subversion/branches/svnraisetc/configure.ac:874709-875149
+/subversion/branches/svnserve-logging/configure.ac:869828-870893
+/subversion/branches/tc-issue-3334/configure.ac:874697-874773
+/subversion/branches/tc-merge-notify/configure.ac:874017-874062
+/subversion/branches/tc-resolve/configure.ac:874191-874239
+/subversion/branches/tc_url_rev/configure.ac:874351-874483
+/subversion/branches/tree-conflicts/configure.ac:868291-873154
+/subversion/branches/tree-conflicts-notify/configure.ac:873926-874008
+/subversion/branches/tristate-chunked-request/configure.ac:1502394-1502681
+/subversion/branches/tweak-build-take-two/configure.ac:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/configure.ac:1060426-1064427
+/subversion/branches/verify-at-commit/configure.ac:1462039-1462408
+/subversion/branches/verify-keep-going/configure.ac:1439280-1546110
+/subversion/branches/wc-collate-path/configure.ac:1402685-1480384
+/subversion/trunk/configure.ac:1606692-1634606
Propchange: subversion/branches/move-tracking-2/notes/
------------------------------------------------------------------------------
Merged /subversion/trunk/notes:r1622194-1634606
Modified: subversion/branches/move-tracking-2/notes/knobs
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/notes/knobs?rev=1634609&r1=1634608&r2=1634609&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/notes/knobs (original)
+++ subversion/branches/move-tracking-2/notes/knobs Mon Oct 27 17:28:13 2014
@@ -55,6 +55,7 @@ SVN_SQLITE_MIN_VERSION_NUMBER
SVN_SQLITE_MIN_VERSION
SVN_SERF_NO_LOGGING
SVN_ALLOW_SHORT_INTS
+SVN_ALLOW_NON_8_BIT_CHARS
2.3 Debugging Support
@@ -290,6 +291,18 @@ SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2
Default: not defined
Suggested: not defined (to ensure correct behaviour)
+4.12 SVN_ALLOW_NON_8_BIT_CHARS
+
+ Scope: global
+ Purpose: Disables the size check for the 'char' type. We assume char
+ has exactly 8 bits. Other values may break the code reading,
+ interpreting and writing repository files. Defining this option
+ will allow SVN to be compiled even if the size check would fail
+ for some reason.
+ Range: definedness
+ Default: not defined
+ Suggested: not defined (to ensure correct behaviour)
+
5 Defines controlling debug support
==================================
Propchange: subversion/branches/move-tracking-2/subversion/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 17:28:13 2014
@@ -0,0 +1,85 @@
+/subversion/branches/1.5.x-r30215/subversion:870312
+/subversion/branches/1.7.x-fs-verify/subversion:1146708,1161180
+/subversion/branches/10Gb/subversion: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/subversion:965046-1000689
+/subversion/branches/authzperf/subversion:1615360
+/subversion/branches/auto-props-sdc/subversion:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/subversion:872050-872529
+/subversion/branches/cache-server/subversion:1458643-1476567
+/subversion/branches/diff-callbacks3/subversion:870059-870761
+/subversion/branches/diff-optimizations/subversion:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/subversion:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/subversion:870728-871118
+/subversion/branches/double-delete/subversion:870511-872970
+/subversion/branches/ev2-export/subversion:1325914,1332738,1413107
+/subversion/branches/explore-wc/subversion: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/subversion:871779-873302
+/subversion/branches/fs-rep-sharing/subversion:869036-873803
+/subversion/branches/fsfs-format7/subversion: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/subversion:1499981-1547039
+/subversion/branches/fsfs-lock-many/subversion:1571740-1577217
+/subversion/branches/fsfs-pack/subversion:873717-874575
+/subversion/branches/fsx/subversion:1507845-1509914
+/subversion/branches/gnome-keyring/subversion:870558-871410
+/subversion/branches/gpg-agent-password-store/subversion:1005036-1150766
+/subversion/branches/gtest_addition/subversion:1452117-1502138
+/subversion/branches/http-protocol-v2/subversion:874395-876041
+/subversion/branches/in-memory-cache/subversion:869829-871452
+/subversion/branches/in-repo-authz/subversion:1414342-1424779
+/subversion/branches/inheritable-props/subversion:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/subversion:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/subversion:998649-998852
+/subversion/branches/integrate-compression-level/subversion:1068651-1072287
+/subversion/branches/integrate-io-improvements/subversion:1068684-1072297
+/subversion/branches/integrate-is-cachable/subversion:1072568-1074082
+/subversion/branches/integrate-partial-getter/subversion:1072558-1076552
+/subversion/branches/integrate-readline-speedup/subversion:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/subversion:1068695-1072516
+/subversion/branches/integrate-string-improvements/subversion:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/subversion:1072541-1078213
+/subversion/branches/issue-2779-dev/subversion:965496-984198
+/subversion/branches/issue-2843-dev/subversion:871432-874179
+/subversion/branches/issue-3000/subversion:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/subversion:873375-874084
+/subversion/branches/issue-3148-dev/subversion:875193-875204
+/subversion/branches/issue-3220-dev/subversion:872210-872226
+/subversion/branches/issue-3242-dev/subversion:879653-896436
+/subversion/branches/issue-3334-dirs/subversion:875156-875867
+/subversion/branches/issue-3975/subversion:1152931-1160746
+/subversion/branches/issue-4116-dev/subversion:1424719-1425040
+/subversion/branches/issue-4194-dev/subversion:1410507-1414880
+/subversion/branches/javahl-ra/subversion:991978-1494640
+/subversion/branches/kwallet/subversion:870785-871314
+/subversion/branches/log-addressing/subversion:1509279-1546844
+/subversion/branches/log-g-performance/subversion:870941-871032
+/subversion/branches/merge-skips-obstructions/subversion:874525-874615
+/subversion/branches/multi-layer-moves/subversion:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/subversion:870276,870376
+/subversion/branches/node_pool/subversion:1304828-1305388
+/subversion/branches/performance/subversion: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
,1029342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/py-tests-as-modules/subversion:956579-1033052
+/subversion/branches/ra_serf-digest-authn/subversion:875693-876404
+/subversion/branches/reintegrate-improvements/subversion:873853-874164
+/subversion/branches/remote-only-status/subversion:1581845-1586090
+/subversion/branches/revprop-cache/subversion:1298521-1326293
+/subversion/branches/revprop-packing/subversion:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/subtree-mergeinfo/subversion:876734-878766
+/subversion/branches/svn-mergeinfo-enhancements/subversion:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/subversion:918519-934609
+/subversion/branches/svn_mutex/subversion:1141683-1182099
+/subversion/branches/svnpatch-diff/subversion:865738-876477
+/subversion/branches/svnraisetc/subversion:874709-875149
+/subversion/branches/svnserve-logging/subversion:869828-870893
+/subversion/branches/tc-issue-3334/subversion:874697-874773
+/subversion/branches/tc-merge-notify/subversion:874017-874062
+/subversion/branches/tc-resolve/subversion:874191-874239
+/subversion/branches/tc_url_rev/subversion:874351-874483
+/subversion/branches/tree-conflicts/subversion:868291-873154
+/subversion/branches/tree-conflicts-notify/subversion:873926-874008
+/subversion/branches/tristate-chunked-request/subversion:1502394-1502681
+/subversion/branches/tweak-build-take-two/subversion:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/subversion:1060426-1064427
+/subversion/branches/verify-at-commit/subversion:1462039-1462408
+/subversion/branches/verify-keep-going/subversion:1439280-1546110
+/subversion/branches/wc-collate-path/subversion:1402685-1480384
+/subversion/trunk/subversion:1606692-1634606
Modified:
subversion/branches/move-tracking-2/subversion/include/private/svn_dep_compat.h
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_dep_compat.h?rev=1634609&r1=1634608&r2=1634609&view=diff
==============================================================================
---
subversion/branches/move-tracking-2/subversion/include/private/svn_dep_compat.h
(original)
+++
subversion/branches/move-tracking-2/subversion/include/private/svn_dep_compat.h
Mon Oct 27 17:28:13 2014
@@ -47,6 +47,19 @@ extern "C" {
#endif
/**
+ * We assume that 'char' is 8 bits wide. The critical interfaces are
+ * our repository formats and RA encodings. E.g. a 32 bit wide char may
+ * mess up UTF8 parsing, how we interpret size values etc.
+ *
+ * @since New in 1.9.
+ */
+#if defined(CHAR_BIT) \
+ && !defined(SVN_ALLOW_NON_8_BIT_CHARS) \
+ && (CHAR_BIT != 8)
+#error char is not 8 bits and may break Subversion. Define
SVN_ALLOW_NON_8_BIT_CHARS to skip this check.
+#endif
+
+/**
* Work around a platform dependency issue. apr_thread_rwlock_trywrlock()
* will make APR_STATUS_IS_EBUSY() return TRUE if the lock could not be
* acquired under Unix. Under Windows, this will not work. So, provide
Modified: subversion/branches/move-tracking-2/subversion/include/svn_client.h
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/svn_client.h?rev=1634609&r1=1634608&r2=1634609&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/svn_client.h
(original)
+++ subversion/branches/move-tracking-2/subversion/include/svn_client.h Mon Oct
27 17:28:13 2014
@@ -1081,20 +1081,15 @@ svn_client_create_context(svn_client_ctx
/** @} end group: Client context management */
/**
- * @name Authentication information file names
- *
- * Names of files that contain authentication information.
- *
- * These filenames are decided by libsvn_client, since this library
- * implements all the auth-protocols; libsvn_wc does nothing but
- * blindly store and retrieve these files from protected areas.
- *
- * @defgroup clnt_auth_filenames Client authentication file names
- * @{
+ * @deprecated Provided for backward compatibility. This constant was never
+ * used in released versions.
*/
#define SVN_CLIENT_AUTH_USERNAME "username"
+/**
+ * @deprecated Provided for backward compatibility. This constant was never
+ * used in released versions.
+ */
#define SVN_CLIENT_AUTH_PASSWORD "password"
-/** @} group end: Authentication information file names */
/** Client argument processing
*
Modified: subversion/branches/move-tracking-2/subversion/include/svn_cmdline.h
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/svn_cmdline.h?rev=1634609&r1=1634608&r2=1634609&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/svn_cmdline.h
(original)
+++ subversion/branches/move-tracking-2/subversion/include/svn_cmdline.h Mon
Oct 27 17:28:13 2014
@@ -320,15 +320,58 @@ svn_cmdline_auth_plaintext_passphrase_pr
* by the command line client.
*
* @a non_interactive, @a username, @a password, @a config_dir,
- * @a no_auth_cache, and @a trust_server_cert are the values of the
- * command line options of the corresponding names.
+ * and @a no_auth_cache are the values of the command line options
+ * of the corresponding names.
*
+ * If @a non_interactive is @c TRUE, then the following parameters
+ * control whether an invalid SSL certificate will be accepted
+ * regardless of a specific verification failure:
+ *
+ * @a trust_server_cert_unknown_ca: If @c TRUE, accept certificates
+ * from unknown certificate authorities.
+ *
+ * @a trust_server_cert_cn_mismatch: If @c TRUE, accept certificates
+ * even if the Common Name attribute of the certificate differs from
+ * the hostname of the server.
+ *
+ * @a trust_server_cert_expired: If @c TRUE, accept certificates even
+ * if they are expired.
+ *
+ * @a trust_server_cert_not_yet_valid: If @c TRUE, accept certificates
+ * from the future.
+ *
+ * @a trust_server_cert_other_failure: If @c TRUE, accept certificates
+ * even if any other verification failure than the above occured.
+ *
* @a cfg is the @c SVN_CONFIG_CATEGORY_CONFIG configuration, and
* @a cancel_func and @a cancel_baton control the cancellation of the
* prompting providers that are initialized.
*
* Use @a pool for all allocations.
*
+ * @since New in 1.9.
+ */
+svn_error_t *
+svn_cmdline_create_auth_baton2(svn_auth_baton_t **ab,
+ svn_boolean_t non_interactive,
+ const char *username,
+ const char *password,
+ const char *config_dir,
+ svn_boolean_t no_auth_cache,
+ svn_boolean_t trust_server_cert_unknown_ca,
+ svn_boolean_t trust_server_cert_cn_mismatch,
+ svn_boolean_t trust_server_cert_expired,
+ svn_boolean_t trust_server_cert_not_yet_valid,
+ svn_boolean_t trust_server_cert_other_failure,
+ svn_config_t *cfg,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *pool);
+
+/* Like svn_cmdline_create_auth_baton2, but with only one trust_server_cert
+ * option which corresponds to trust_server_cert_unknown_ca.
+ *
+ * @deprecated Provided for backward compatibility with the 1.8 API.
* @since New in 1.6.
*/
svn_error_t *
Modified: subversion/branches/move-tracking-2/subversion/include/svn_delta.h
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/svn_delta.h?rev=1634609&r1=1634608&r2=1634609&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/svn_delta.h
(original)
+++ subversion/branches/move-tracking-2/subversion/include/svn_delta.h Mon Oct
27 17:28:13 2014
@@ -249,6 +249,7 @@ svn_txdelta_compose_windows(const svn_tx
*
* @since New in 1.4
*
+ * @since Since 1.9, @a tbuf may be NULL if @a *tlen is 0.
*/
void
svn_txdelta_apply_instructions(svn_txdelta_window_t *window,
Modified:
subversion/branches/move-tracking-2/subversion/include/svn_error_codes.h
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/svn_error_codes.h?rev=1634609&r1=1634608&r2=1634609&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/svn_error_codes.h
(original)
+++ subversion/branches/move-tracking-2/subversion/include/svn_error_codes.h
Mon Oct 27 17:28:13 2014
@@ -817,17 +817,17 @@ SVN_ERROR_START
"Malformed transaction ID string.")
/** @since New in 1.9. */
- SVN_ERRDEF(SVN_ERR_FS_ITEM_INDEX_CORRUPTION,
+ SVN_ERRDEF(SVN_ERR_FS_INDEX_CORRUPTION,
SVN_ERR_FS_CATEGORY_START + 54,
"Corrupt index file.")
/** @since New in 1.9. */
- SVN_ERRDEF(SVN_ERR_FS_ITEM_INDEX_REVISION,
+ SVN_ERRDEF(SVN_ERR_FS_INDEX_REVISION,
SVN_ERR_FS_CATEGORY_START + 55,
"Revision not covered by index.")
/** @since New in 1.9. */
- SVN_ERRDEF(SVN_ERR_FS_ITEM_INDEX_OVERFLOW,
+ SVN_ERRDEF(SVN_ERR_FS_INDEX_OVERFLOW,
SVN_ERR_FS_CATEGORY_START + 56,
"Item index too large for this revision.")
@@ -837,7 +837,7 @@ SVN_ERROR_START
"Container index out of range.")
/** @since New in 1.9. */
- SVN_ERRDEF(SVN_ERR_FS_ITEM_INDEX_INCONSISTENT,
+ SVN_ERRDEF(SVN_ERR_FS_INDEX_INCONSISTENT,
SVN_ERR_FS_CATEGORY_START + 58,
"Index files are inconsistent.")
@@ -856,6 +856,16 @@ SVN_ERROR_START
SVN_ERR_FS_CATEGORY_START + 61,
"Container capacity exceeded.")
+ /** @since New in 1.9. */
+ SVN_ERRDEF(SVN_ERR_FS_MALFORMED_NODEREV_ID,
+ SVN_ERR_FS_CATEGORY_START + 62,
+ "Malformed node revision ID string.")
+
+ /** @since New in 1.9. */
+ SVN_ERRDEF(SVN_ERR_FS_INVALID_GENERATION,
+ SVN_ERR_FS_CATEGORY_START + 63,
+ "Invalid generation number data.")
+
/* repos errors */
SVN_ERRDEF(SVN_ERR_REPOS_LOCKED,
Modified: subversion/branches/move-tracking-2/subversion/include/svn_fs.h
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/svn_fs.h?rev=1634609&r1=1634608&r2=1634609&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/svn_fs.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/svn_fs.h Mon Oct 27
17:28:13 2014
@@ -116,6 +116,16 @@ typedef struct svn_fs_t svn_fs_t;
*/
#define SVN_FS_CONFIG_FSFS_BLOCK_READ "fsfs-block-read"
+/** String with a decimal representation of the FSFS format shard size.
+ * Zero ("0") means that a repository with linear layout should be created.
+ *
+ * This option will only be used during the creation of new repositories
+ * and is otherwise ignored.
+ *
+ * @since New in 1.9.
+ */
+#define SVN_FS_CONFIG_FSFS_SHARD_SIZE "fsfs-shard-size"
+
/* Note to maintainers: if you add further SVN_FS_CONFIG_FSFS_CACHE_* knobs,
update fs_fs.c:verify_as_revision_before_current_plus_plus(). */
@@ -1417,6 +1427,11 @@ typedef enum svn_fs_path_change_kind_t
* versions. Therefore, to preserve binary compatibility, users
* should not directly allocate structures of this type.
*
+ * @note The @c text_mod, @c prop_mod and @c mergeinfo_mod flags mean the
+ * text, properties and mergeinfo property (respectively) were "touched"
+ * by the commit API; this does not mean the new value is different from
+ * the old value.
+ *
* @since New in 1.6. */
typedef struct svn_fs_path_change2_t
{
@@ -1426,10 +1441,23 @@ typedef struct svn_fs_path_change2_t
/** kind of change */
svn_fs_path_change_kind_t change_kind;
- /** were there text mods? */
+ /** was the text touched?
+ * For node_kind=dir: always false. For node_kind=file:
+ * modify: true iff text touched.
+ * add (copy): true iff text touched.
+ * add (plain): always true.
+ * delete: always false.
+ * replace: as for the add/copy part of the replacement.
+ */
svn_boolean_t text_mod;
- /** were there property mods? */
+ /** were the properties touched?
+ * modify: true iff props touched.
+ * add (copy): true iff props touched.
+ * add (plain): true iff props touched.
+ * delete: always false.
+ * replace: as for the add/copy part of the replacement.
+ */
svn_boolean_t prop_mod;
/** what node kind is the path?
@@ -1442,7 +1470,12 @@ typedef struct svn_fs_path_change2_t
svn_revnum_t copyfrom_rev;
const char *copyfrom_path;
- /** were there mergeinfo mods?
+ /** was the mergeinfo property touched?
+ * modify: } true iff svn:mergeinfo property add/del/mod
+ * add (copy): } and fs format supports this flag.
+ * add (plain): }
+ * delete: always false.
+ * replace: as for the add/copy part of the replacement.
* (Note: Pre-1.9 repositories will report #svn_tristate_unknown.)
* @since New in 1.9. */
svn_tristate_t mergeinfo_mod;
Modified: subversion/branches/move-tracking-2/subversion/include/svn_io.h
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/svn_io.h?rev=1634609&r1=1634608&r2=1634609&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/svn_io.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/svn_io.h Mon Oct 27
17:28:13 2014
@@ -1534,6 +1534,10 @@ typedef svn_error_t *
* If the only "access" the returned stream gets is to close it
* then @a open_func will only be called if @a open_on_close is TRUE.
*
+ * Allocate the returned stream in @a result_pool. Also arrange for
+ * @a result_pool to be passed as the @c result_pool parameter to
+ * @a open_func when it is called.
+ *
* @since New in 1.8.
*/
svn_stream_t *
Modified: subversion/branches/move-tracking-2/subversion/include/svn_string.h
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/svn_string.h?rev=1634609&r1=1634608&r2=1634609&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/svn_string.h
(original)
+++ subversion/branches/move-tracking-2/subversion/include/svn_string.h Mon Oct
27 17:28:13 2014
@@ -140,6 +140,8 @@ svn_string_create_empty(apr_pool_t *pool
/** Create a new string copied from a generic string of bytes, @a bytes, of
* length @a size bytes. @a bytes is NOT assumed to be null-terminated, but
* the new string will be.
+ *
+ * @since Since 1.9, @a bytes can be NULL if @a size is zero.
*/
svn_string_t *
svn_string_ncreate(const char *bytes, apr_size_t size, apr_pool_t *pool);
@@ -205,6 +207,8 @@ svn_stringbuf_create(const char *cstring
/** Create a new stringbuf copied from the generic string of bytes, @a bytes,
* of length @a size bytes. @a bytes is NOT assumed to be null-terminated,
* but the new stringbuf will be.
+ *
+ * @since Since 1.9, @a bytes can be NULL if @a size is zero.
*/
svn_stringbuf_t *
svn_stringbuf_ncreate(const char *bytes, apr_size_t size, apr_pool_t *pool);
@@ -307,6 +311,8 @@ svn_stringbuf_appendbyte(svn_stringbuf_t
/** Append an array of bytes onto @a targetstr.
*
* reallocs if necessary. @a targetstr is affected, nothing else is.
+ *
+ * @since 1.9 @a bytes can be NULL if @a count is zero.
*/
void
svn_stringbuf_appendbytes(svn_stringbuf_t *targetstr,
@@ -349,6 +355,8 @@ svn_stringbuf_appendcstr(svn_stringbuf_t
* @note The inserted string may be a sub-range if @a str.
*
* @since New in 1.8.
+ *
+ * @since Since 1.9, @a bytes can be NULL if @a count is zero.
*/
void
svn_stringbuf_insert(svn_stringbuf_t *str,
@@ -380,6 +388,8 @@ svn_stringbuf_remove(svn_stringbuf_t *st
* @endcode
*
* @since New in 1.8.
+ *
+ * @since Since 1.9, @a bytes can be NULL if @a new_count is zero.
*/
void
svn_stringbuf_replace(svn_stringbuf_t *str,
Modified: subversion/branches/move-tracking-2/subversion/include/svn_wc.h
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/svn_wc.h?rev=1634609&r1=1634608&r2=1634609&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/svn_wc.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/svn_wc.h Mon Oct 27
17:28:13 2014
@@ -5167,6 +5167,12 @@ svn_wc_committed_queue_create(apr_pool_t
* ### seems to be not a set of changes but rather the new complete set of
* ### props. And it's renamed to 'new_dav_cache' inside; why?
*
+ * If @a is_committed is @c TRUE, the node will be processed as committed. This
+ * turns the node and its implied descendants as the new unmodified state at
+ * the new specified revision. Unless @a recurse is TRUE, changes on
+ * descendants are not committed as changes directly. In this case they should
+ * be queueud as their own changes.
+ *
* If @a remove_lock is @c TRUE, any entryprops related to a repository
* lock will be removed.
*
@@ -5204,7 +5210,25 @@ svn_wc_committed_queue_create(apr_pool_t
* Temporary allocations will be performed in @a scratch_pool, and persistent
* allocations will use the same pool as @a queue used when it was created.
*
+ * @since New in 1.9.
+ */
+svn_error_t *
+svn_wc_queue_committed4(svn_wc_committed_queue_t *queue,
+ svn_wc_context_t *wc_ctx,
+ const char *local_abspath,
+ svn_boolean_t recurse,
+ svn_boolean_t is_committed,
+ const apr_array_header_t *wcprop_changes,
+ svn_boolean_t remove_lock,
+ svn_boolean_t remove_changelist,
+ const svn_checksum_t *sha1_checksum,
+ apr_pool_t *scratch_pool);
+
+/** Similar to svn_wc_queue_committed4, but with is_committed always
+ * TRUE.
+ *
* @since New in 1.7.
+ * @deprecated Provided for backwards compatibility with the 1.8 API.
*/
svn_error_t *
svn_wc_queue_committed3(svn_wc_committed_queue_t *queue,
