You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2017/05/09 10:41:35 UTC
svn commit: r1794530 - in /subversion/branches/1.9.x-strict-rep-sharing: ./
build/ subversion/libsvn_client/ subversion/libsvn_fs_fs/
subversion/libsvn_repos/ subversion/libsvn_subr/ subversion/svnadmin/
subversion/tests/libsvn_subr/
Author: stsp
Date: Tue May 9 10:41:35 2017
New Revision: 1794530
URL: http://svn.apache.org/viewvc?rev=1794530&view=rev
Log:
On the 1.9.x-strict-rep-sharing branch, catch up with 1.9.x@r1794526.
This was a clean merge.
Modified:
subversion/branches/1.9.x-strict-rep-sharing/ (props changed)
subversion/branches/1.9.x-strict-rep-sharing/STATUS
subversion/branches/1.9.x-strict-rep-sharing/build/run_tests.py
subversion/branches/1.9.x-strict-rep-sharing/subversion/libsvn_client/copy.c
subversion/branches/1.9.x-strict-rep-sharing/subversion/libsvn_fs_fs/rep-cache.c
subversion/branches/1.9.x-strict-rep-sharing/subversion/libsvn_repos/dump.c
subversion/branches/1.9.x-strict-rep-sharing/subversion/libsvn_subr/io.c
subversion/branches/1.9.x-strict-rep-sharing/subversion/svnadmin/svnadmin.c
subversion/branches/1.9.x-strict-rep-sharing/subversion/tests/libsvn_subr/io-test.c
Propchange: subversion/branches/1.9.x-strict-rep-sharing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 9 10:41:35 2017
@@ -2,6 +2,7 @@
/subversion/branches/1.5.x-r30215:870312
/subversion/branches/1.7.x-fs-verify:1146708,1161180
/subversion/branches/1.9-cache-improvements:1678948-1679863
+/subversion/branches/1.9.x:1786535-1794526
/subversion/branches/1.9.x-fsfs-pack-fixes:1759183-1770158
/subversion/branches/1.9.x-fsfs-rep-comparison:1717869-1739708
/subversion/branches/1.9.x-r1664664:1674265-1674433
@@ -103,4 +104,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663253,1663286,1663338,1663347,1663355,1663374,1663450,1663500,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665873,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1668625,1669743,1669746,1669749,1669945,167
0139,1670149,1670152,1670329,1670337,1670347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674626-1674627,1674785,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678755,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679240,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1682714,1682854,1683071,1683126,1683135,1683266-1683267,1683290,1683303,1683311,1683378,1683387,1684034,1684077,1684322,1684325,1684344,1684412,1684940,1685034,1685085,1686175,1686239,1686478,1686541,1686543,
1686554,1686557,1686802,1686888,1686984,1687029,1687304,1687389,1687769,1687776,1687812,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,1691924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135,1693138,1693159,1693886,1694023,1694194,1694481,1694929,1695022,1695600,1695606,1695681,1696222,1696225,1696387,1696695,1697381,1697384,1697387,1697664,1697824,1697835,1697845,1697914,1697967,1698106,1698312,1700130,1700215,1700219-1700220,1700740,1700951,1701064,1701206,1701270,1701298,1701598,1701603,1701611,1701633,1701638,1701646,1701736,1701792,1701797,1701838,1701997,1702198,1702200,1702203,1702218,1702231,1702237-1702239,1702247,1702288,1702299-1702300,1702310,1702397,1702407,1702467,1702472,1702474,1702478,1702533,1702549,1702553,1702565,1702891,1702974,1702991,1703470,1703475-1703477,1703544,1703581,1703675,1703688-1703689,1703740,1704292,1704573,1704821,1704847,1705060,1705062,1705064,1705088,1705328,1705843,1706241,1706323-17063
24,1706375,1706428,1706437,1706783,1706983,1706999,1708699,1709388-1709389,1709553,1709562,1710104,1710167,1710215,1710290,1710558,1711250,1711346,1711507,1711510,1714314,1714358,1714790,1715224,1715232,1715262,1715777,1715793,1716808,1717154,1717869,1717871,1717873-1717875,1717878,1718167,1718267,1718269,1718484,1720015,1720643,1721174-1721175,1721285,1721488,1721648,1722164,1722860-1722861,1722879,1722887,1724448,1725180,1728308,1728387,1729060,1729519,1730856,1734106,1734926,1735179,1735826,1736432,1737122,1738259,1738659,1738828,1739278,1739280,1740252,1740254,1740316,1741071-1741073,1741078,1741096,1741200,1741206,1741401,1745515,1746053,1746277,1746364,1748514,1754190,1756266,1757529,1757532,1757539,1758128-1758130,1758153,1758202,1758204,1758207,1758209,1758224,1758269,1758385,1758781,1759117-1759124,1759686,1760570,1761334,1761653,1761755,1762338-1762339,1763934,1764034,1764676,1764851,1766240,1766323,1766327,1766352,1766590,1766699,1766704,1766711,1767768,1769152,1769456,17
69973,1770677,1785734,1785737-1785738,1785754,1786445-1786447,1786515
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663253,1663286,1663338,1663347,1663355,1663374,1663450,1663500,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665873,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1668625,1669743,1669746,1669749,1669945,167
0139,1670149,1670152,1670329,1670337,1670347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674626-1674627,1674785,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678755,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679240,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1682714,1682854,1683071,1683126,1683135,1683266-1683267,1683290,1683303,1683311,1683378,1683387,1684034,1684077,1684322,1684325,1684344,1684412,1684940,1685034,1685085,1686175,1686239,1686478,1686541,1686543,
1686554,1686557,1686802,1686888,1686984,1687029,1687304,1687389,1687769,1687776,1687812,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,1691924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135,1693138,1693159,1693886,1694023,1694194,1694481,1694929,1695022,1695600,1695606,1695681,1696222,1696225,1696387,1696695,1697381,1697384,1697387,1697664,1697824,1697835,1697845,1697914,1697967,1698106,1698312,1700130,1700215,1700219-1700220,1700740,1700951,1701064,1701206,1701270,1701298,1701598,1701603,1701611,1701633,1701638,1701646,1701736,1701792,1701797,1701838,1701997,1702198,1702200,1702203,1702218,1702231,1702237-1702239,1702247,1702288,1702299-1702300,1702310,1702397,1702407,1702467,1702472,1702474,1702478,1702533,1702549,1702553,1702565,1702891,1702974,1702991,1703470,1703475-1703477,1703544,1703581,1703675,1703688-1703689,1703740,1704292,1704573,1704821,1704847,1705060,1705062,1705064,1705088,1705328,1705843,1706241,1706323-17063
24,1706375,1706428,1706432,1706437,1706783,1706983,1706999,1708699,1709388-1709389,1709553,1709562,1710104,1710167,1710215,1710290,1710558,1711250,1711346,1711507,1711510,1714314,1714358,1714790,1715224,1715232,1715262,1715777,1715793,1716808,1717154,1717869,1717871,1717873-1717875,1717878,1718167,1718267,1718269,1718484,1720015,1720643,1721174-1721175,1721285,1721488,1721648,1722164,1722860-1722861,1722879,1722887,1724448,1725180,1728308,1728387,1729060,1729519,1730856,1734106,1734926,1735179,1735826,1736432,1737122,1738259,1738659,1738828,1739278,1739280,1740252,1740254,1740316,1741071-1741073,1741078,1741096,1741200,1741206,1741401,1745515,1746053,1746277,1746364,1748514,1754190,1756266,1757529,1757532,1757539,1758128-1758130,1758153,1758202,1758204,1758207,1758209,1758224,1758269,1758385,1758781,1759116-1759124,1759686,1760570,1761334,1761653,1761755,1762338-1762339,1763934,1764034,1764676,1764851,1766240,1766323,1766327,1766352,1766590,1766699,1766704,1766711,1767768,1769152,17
69456,1769973,1770677,1774109,1779948,1781507,1781655,1785734,1785737-1785738,1785754,1786445-1786447,1786515
Modified: subversion/branches/1.9.x-strict-rep-sharing/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-strict-rep-sharing/STATUS?rev=1794530&r1=1794529&r2=1794530&view=diff
==============================================================================
--- subversion/branches/1.9.x-strict-rep-sharing/STATUS (original)
+++ subversion/branches/1.9.x-strict-rep-sharing/STATUS Tue May 9 10:41:35 2017
@@ -28,13 +28,6 @@ Candidate changes:
this behavior change was reverted when a better fix was
implemented)
- * r1774109
- Document the purpose of 'svnadmin freeze' more clearly.
- Justification:
- Not very important, nice to have documentation fix. Trivial merge.
- Votes:
- +1: stsp, julianfoad
-
* r1776742, r1776783, r1776788
Issue #4667: Reduce memory usage during merge, by tighter pool usage.
Justification:
@@ -46,49 +39,40 @@ Candidate changes:
nominated later. The issue #4667 need not be "closed" for this to be
a useful backport.
Votes:
- +1: julianfoad
-
- * r1779948
- Improve error message when copying/moving into unversioned dir.
- Justification:
- The current error message is misleading. It says "not a directory"
- but there is a directory on disk.
- User complained.
- Votes:
- +1: stsp
-
-* r1706432
- Fix tests on Windows when passing --bin to win_tests.py.
- Justification:
- Tests should simply work.
- Notes:
- Fixes a bad commandline argument encoding in the Windows test runner.
- Regression introduced in 1.9.2.
- Votes:
- +1: rhuijben
- +1 (non-binding): luke1410
-
- * r1781507
- Fix a NULL deref in libsvn_repos which makes svndumpfilter crash.
- Justification:
- Should not crash. User complained.
- Votes:
- +1: stsp
-
- * r1781655
- Improve error message upon failure to open rep-cache.
- Justification:
- The current message lacks sufficient detail to be useful when it appears
- in server logs.
- Votes:
- +1: stsp
+ +1: julianfoad, stefan2
* r1783704
Add support to build with 'zlibstat.lib' in install-layout on Windows.
Justification:
Simplifies build process on Windows.
Votes:
- +1: luke1410
+ +1: luke1410, rhuijben
+
+ * r1785737, r1785738, r1785734, r1786447, r1785754, r1786445, r1786446, r1786515
+ Make FSFS consistency no longer depend on hash algorithms.
+ Justification:
+ This eliminates any existing or future FSFS vulnerability due to
+ attacks on MD5 or SHA1.
+ Branch:
+ ^/subversion/branches/1.9.x-strict-rep-sharing
+ Notes:
+ Depends on r1759116 for correctness with older APR.
+ While the backport code is very close to the /trunk changes, it is
+ easier to review them as r1786580, r1786581 and r1786619 on the branch.
+ Will create a text conflict with the r1785053 backport. Depending on
+ which change gets merged first, the respective other must be updated.
+ Votes:
+ +1: stefan2, rhuijben
+
+ * r1794166
+ Find gpg-agent socket using gpgconf, if possible.
+ Justification:
+ Improves GPG socket detection when $GPG_AGENT_INFO is unset or when gpg
+ >= 2.1.13 is used
+ Branch:
+ ^/subversion/branches/1.9.x-r1794166
+ Votes:
+ +1: jamessan
Veto-blocked changes:
=====================
@@ -111,3 +95,18 @@ Veto-blocked changes:
Approved changes:
=================
+
+ * r1785053
+ Never attempt to share directory representations in FSFS.
+ Justification:
+ This fixes inconsistent behavior. We never add dir reps to the rep-
+ cache but would happily share any file or prop rep that happens to
+ match the respective directory rep.
+ Branch:
+ ^/subversion/branches/1.9.x-r1785053
+ Notes:
+ Will create a text conflict with the strict-rep-sharing patches.
+ Depending on which change gets merged first, the respective other
+ needs to be updated.
+ Votes:
+ +1: stefan2, rhuijben, stsp
Modified: subversion/branches/1.9.x-strict-rep-sharing/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-strict-rep-sharing/build/run_tests.py?rev=1794530&r1=1794529&r2=1794530&view=diff
==============================================================================
--- subversion/branches/1.9.x-strict-rep-sharing/build/run_tests.py (original)
+++ subversion/branches/1.9.x-strict-rep-sharing/build/run_tests.py Tue May 9 10:41:35 2017
@@ -213,7 +213,7 @@ class TestHarness:
else:
cmdline.append('--parallel-instances=%d' % self.opts.parallel)
if self.opts.svn_bin is not None:
- cmdline.append('--bin=%s', self.opts.svn_bin)
+ cmdline.append('--bin=%s' % self.opts.svn_bin)
if self.opts.url is not None:
cmdline.append('--url=%s' % self.opts.url)
if self.opts.fs_type is not None:
Modified: subversion/branches/1.9.x-strict-rep-sharing/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-strict-rep-sharing/subversion/libsvn_client/copy.c?rev=1794530&r1=1794529&r2=1794530&view=diff
==============================================================================
--- subversion/branches/1.9.x-strict-rep-sharing/subversion/libsvn_client/copy.c (original)
+++ subversion/branches/1.9.x-strict-rep-sharing/subversion/libsvn_client/copy.c Tue May 9 10:41:35 2017
@@ -1057,10 +1057,24 @@ verify_wc_dsts(const apr_array_header_t
ctx->wc_ctx, pair->dst_parent_abspath,
FALSE, TRUE,
iterpool));
- if (make_parents && dst_parent_kind == svn_node_none)
+ if (dst_parent_kind == svn_node_none)
{
- SVN_ERR(svn_client__make_local_parents(pair->dst_parent_abspath,
- TRUE, ctx, iterpool));
+ if (make_parents)
+ SVN_ERR(svn_client__make_local_parents(pair->dst_parent_abspath,
+ TRUE, ctx, iterpool));
+ else
+ {
+ SVN_ERR(svn_io_check_path(pair->dst_parent_abspath,
+ &dst_parent_kind, scratch_pool));
+ return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND, NULL,
+ (dst_parent_kind == svn_node_dir)
+ ? _("Directory '%s' is not under "
+ "version control")
+ : _("Path '%s' is not a directory"),
+ svn_dirent_local_style(
+ pair->dst_parent_abspath,
+ scratch_pool));
+ }
}
else if (dst_parent_kind != svn_node_dir)
{
Modified: subversion/branches/1.9.x-strict-rep-sharing/subversion/libsvn_fs_fs/rep-cache.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-strict-rep-sharing/subversion/libsvn_fs_fs/rep-cache.c?rev=1794530&r1=1794529&r2=1794530&view=diff
==============================================================================
--- subversion/branches/1.9.x-strict-rep-sharing/subversion/libsvn_fs_fs/rep-cache.c (original)
+++ subversion/branches/1.9.x-strict-rep-sharing/subversion/libsvn_fs_fs/rep-cache.c Tue May 9 10:41:35 2017
@@ -128,7 +128,10 @@ svn_fs_fs__open_rep_cache(svn_fs_t *fs,
fs_fs_data_t *ffd = fs->fsap_data;
svn_error_t *err = svn_atomic__init_once(&ffd->rep_cache_db_opened,
open_rep_cache, fs, pool);
- return svn_error_quick_wrap(err, _("Couldn't open rep-cache database"));
+ return svn_error_quick_wrapf(err,
+ _("Couldn't open rep-cache database '%s'"),
+ svn_dirent_local_style(
+ path_rep_cache_db(fs->path, pool), pool));
}
svn_error_t *
Modified: subversion/branches/1.9.x-strict-rep-sharing/subversion/libsvn_repos/dump.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-strict-rep-sharing/subversion/libsvn_repos/dump.c?rev=1794530&r1=1794529&r2=1794530&view=diff
==============================================================================
--- subversion/branches/1.9.x-strict-rep-sharing/subversion/libsvn_repos/dump.c (original)
+++ subversion/branches/1.9.x-strict-rep-sharing/subversion/libsvn_repos/dump.c Tue May 9 10:41:35 2017
@@ -546,11 +546,15 @@ svn_repos__dump_revision_record(svn_stre
"%" APR_SIZE_T_FMT, propstring->len));
}
- /* Write out a regular Content-length header for the benefit of
- non-Subversion RFC-822 parsers. */
- svn_hash_sets(headers, SVN_REPOS_DUMPFILE_CONTENT_LENGTH,
- apr_psprintf(scratch_pool,
- "%" APR_SIZE_T_FMT, propstring->len));
+ if (propstring)
+ {
+ /* Write out a regular Content-length header for the benefit of
+ non-Subversion RFC-822 parsers. */
+ svn_hash_sets(headers, SVN_REPOS_DUMPFILE_CONTENT_LENGTH,
+ apr_psprintf(scratch_pool,
+ "%" APR_SIZE_T_FMT, propstring->len));
+ }
+
SVN_ERR(write_revision_headers(dump_stream, headers, scratch_pool));
/* End of headers */
Modified: subversion/branches/1.9.x-strict-rep-sharing/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-strict-rep-sharing/subversion/libsvn_subr/io.c?rev=1794530&r1=1794529&r2=1794530&view=diff
==============================================================================
--- subversion/branches/1.9.x-strict-rep-sharing/subversion/libsvn_subr/io.c (original)
+++ subversion/branches/1.9.x-strict-rep-sharing/subversion/libsvn_subr/io.c Tue May 9 10:41:35 2017
@@ -4044,6 +4044,26 @@ svn_io_write_atomic(const char *final_pa
svn_error_t *
svn_io_file_trunc(apr_file_t *file, apr_off_t offset, apr_pool_t *pool)
{
+ /* Workaround for yet another APR issue with trunc.
+
+ If the APR file internally is in read mode, the current buffer pointer
+ will not be clipped to the valid data range. get_file_offset may then
+ return an invalid position *after* new data was written to it.
+
+ To prevent this, write 1 dummy byte just after the OFFSET at which we
+ will trunc it. That will force the APR file into write mode
+ internally and the flush() work-around below becomes affective. */
+ apr_off_t position = 0;
+
+ /* A frequent usage is OFFSET==0, in which case we don't need to preserve
+ any file content or file pointer. */
+ if (offset)
+ {
+ SVN_ERR(svn_io_file_seek(file, APR_CUR, &position, pool));
+ SVN_ERR(svn_io_file_seek(file, APR_SET, &offset, pool));
+ }
+ SVN_ERR(svn_io_file_putc(0, file, pool));
+
/* This is a work-around. APR would flush the write buffer
_after_ truncating the file causing now invalid buffered
data to be written behind OFFSET. */
@@ -4052,10 +4072,17 @@ svn_io_file_trunc(apr_file_t *file, apr_
N_("Can't flush stream"),
pool));
- return do_io_file_wrapper_cleanup(file, apr_file_trunc(file, offset),
- N_("Can't truncate file '%s'"),
- N_("Can't truncate stream"),
- pool);
+ SVN_ERR(do_io_file_wrapper_cleanup(file, apr_file_trunc(file, offset),
+ N_("Can't truncate file '%s'"),
+ N_("Can't truncate stream"),
+ pool));
+
+ /* Restore original file pointer, if necessary.
+ It's currently at OFFSET. */
+ if (position < offset)
+ SVN_ERR(svn_io_file_seek(file, APR_SET, &position, pool));
+
+ return SVN_NO_ERROR;
}
Modified: subversion/branches/1.9.x-strict-rep-sharing/subversion/svnadmin/svnadmin.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-strict-rep-sharing/subversion/svnadmin/svnadmin.c?rev=1794530&r1=1794529&r2=1794530&view=diff
==============================================================================
--- subversion/branches/1.9.x-strict-rep-sharing/subversion/svnadmin/svnadmin.c (original)
+++ subversion/branches/1.9.x-strict-rep-sharing/subversion/svnadmin/svnadmin.c Tue May 9 10:41:35 2017
@@ -396,6 +396,7 @@ static const svn_opt_subcommand_desc2_t
("usage: 1. svnadmin freeze REPOS_PATH PROGRAM [ARG...]\n"
" 2. svnadmin freeze -F FILE PROGRAM [ARG...]\n\n"
"1. Run PROGRAM passing ARGS while holding a write-lock on REPOS_PATH.\n"
+ " Allows safe use of third-party backup tools on a live repository.\n"
"\n"
"2. Like 1 except all repositories listed in FILE are locked. The file\n"
" format is repository paths separated by newlines. Repositories are\n"
Modified: subversion/branches/1.9.x-strict-rep-sharing/subversion/tests/libsvn_subr/io-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-strict-rep-sharing/subversion/tests/libsvn_subr/io-test.c?rev=1794530&r1=1794529&r2=1794530&view=diff
==============================================================================
--- subversion/branches/1.9.x-strict-rep-sharing/subversion/tests/libsvn_subr/io-test.c (original)
+++ subversion/branches/1.9.x-strict-rep-sharing/subversion/tests/libsvn_subr/io-test.c Tue May 9 10:41:35 2017
@@ -783,6 +783,51 @@ test_install_stream_to_longpath(apr_pool
return SVN_NO_ERROR;
}
+static svn_error_t *
+test_apr_trunc_workaround(apr_pool_t *pool)
+{
+ const char *tmp_dir;
+ const char *tmp_file;
+ apr_file_t *f;
+ apr_size_t len;
+ apr_off_t offset;
+ char dummy;
+
+ /* create a temp folder & schedule it for automatic cleanup */
+ SVN_ERR(svn_dirent_get_absolute(&tmp_dir, "test_apr_trunc_workaround",
+ pool));
+ SVN_ERR(svn_io_remove_dir2(tmp_dir, TRUE, NULL, NULL, pool));
+ SVN_ERR(svn_io_make_dir_recursively(tmp_dir, pool));
+ svn_test_add_dir_cleanup(tmp_dir);
+
+ /* create an r/w file */
+ tmp_file = svn_dirent_join(tmp_dir, "file", pool);
+ SVN_ERR(svn_io_file_open(&f, tmp_file,
+ APR_READ | APR_WRITE | APR_BUFFERED | APR_CREATE |
+ APR_TRUNCATE,
+ APR_OS_DEFAULT, pool));
+
+ /* write some content and put it internally into read mode */
+ len = 10;
+ SVN_ERR(svn_io_file_write(f, "0123456789", &len, pool));
+
+ offset = 0;
+ SVN_ERR(svn_io_file_seek(f, APR_SET, &offset, pool));
+ SVN_ERR(svn_io_file_getc(&dummy, f, pool));
+
+ /* clear the file and write some new content */
+ SVN_ERR(svn_io_file_trunc(f, 0, pool));
+ len = 3;
+ SVN_ERR(svn_io_file_write(f, "abc", &len, pool));
+
+ /* we should now be positioned at the end of the new content */
+ offset = 0;
+ SVN_ERR(svn_io_file_seek(f, APR_CUR, &offset, pool));
+ SVN_TEST_ASSERT(offset == (int)len);
+
+ return SVN_NO_ERROR;
+}
+
/* The test table. */
static int max_threads = 3;
@@ -806,6 +851,8 @@ static struct svn_test_descriptor_t test
"test ignore-enoent"),
SVN_TEST_PASS2(test_install_stream_to_longpath,
"test svn_stream__install_stream to long path"),
+ SVN_TEST_PASS2(test_apr_trunc_workaround,
+ "test workaround for APR in svn_io_file_trunc"),
SVN_TEST_NULL
};