svn-role


Patch
r1803756, r1803755, r1803754, r1796970, r1796725, r1796471, r1796470, r1795994, r1795993, r1791565, r1791564, r1791563, r1791562, r1787897, r1770614, r1770613, r1770612, r1770611, r1770610, r1770609, r1770608, r1770607, r1770606, r1770462, r1770308, r1770307, r1770306, r1770305, r1770304, r1770303, r1770302, r1770301, r1770300, r1770299, r1770113, r1770112, r1770111, r1770110, r1770109, r1770108, r1770107, r1769562, r1769561, r1767988, r1767987, r1766621, r1765386, r1765385, r1765006, r1764640, r1764639, r1764638, r1764637, r1764574, r1764573, r1764572, r1764571, r1764570, r1764569, r1764568, r1764567, r1764566, r1764565, r1761670, r1759934, r1759197, r1759051, r1758874, r1758696, r1758695, r1758694, r1757937, r1757936, r1757781, r1757780, r1757779, r1755139, r1751208, r1751207, r1751206, r1751205, r1751204, r1746374, r1746373, r1743454, r1739685, r1739684, r1739399, r1739398, r1739397, r1739396, r1739395, r1739394, r1738890, r1738681, r1737911, r1737910, r1737909, r1736942, r1735185, r1735016, r1735015, r1730783, r1730782, r1730781, r1726465, r1724150, r1723822, r1721871, r1719626, r1719008, r1717705, r1717703, r1716563, r1716562, r1716561, r1716019, r1716018, r1716017, r1716016, r1715319, r1714402, r1713077, r1713076, r1713075, r1713074, r1713073, r1713072, r1710936, r1710935, r1710721, r1710720, r1710471, r1710470, r1710469, r1710305, r1706343, r1703738, r1703329, r1703328, r1703327, r1703092, r1703091, r1703090, r1703089, r1703088, r1702848, r1702847, r1702696, r1702590, r1702589, r1702588, r1702370, r1701900, r1701723, r1701722, r1701440, r1701439, r1701346, r1701345, r1701155, r1701154, r1701153, r1701152, r1698057, r1698056, r1698055, r1698054, r1698053, r1698052, r1697816, r1697815, r1697814, r1697541, r1697540, r1697539, r1697538, r1694136, r1689313, r1688548, r1688547, r1687168, r1687167, r1687166, r1687165, r1687164, r1687163, r1687162, r1687161, r1687160, r1687159, r1687158, r1687157, r1687156, r1687155, r1687154, r1687153, r1687152, r1686967, r1686966, r1686965, r1686964, r1686963, r1685030, r1685029, r1685028, r1684810, r1684809, r1684558, r1684557, r1684556, r1684308, r1683658, r1683457, r1683217, r1682361, r1682147, r1682146, r1682145, r1682144, r1680728, r1680451, r1680450, r1680449, r1680161, r1680160, r1680159, r1680158, r1680157, r1679309, r1679308, r1679307, r1679134, r1679133, r1678856, r1678855, r1678854, r1678853, r1677919, r1677918, r1677917, r1677739, r1677738, r1677737, r1677736, r1677095, r1676896, r1676895, r1674729, r1674728, r1674595, r1674440, r1674439, r1674438, r1674437, r1674436, r1674435, r1674434, r1674433, r1674432, r1674205, r1674204, r1674203, r1674202, r1674201, r1674003, r1674002, r1674001, r1674000, r1673999, r1673998, r1673643, r1673642, r1673641, r1673640, r1673639, r1673638, r1673637, r1673636, r1673635, r1673634, r1673633, r1673632, r1673350, r1673349, r1672978, r1672977, r1672810, r1672003, r1672002, r1672001, r1670997, r1670996, r1670556, r1670555, r1670554, r1670248, r1669986, r1669985, r1669984, r1669983, r1669273, r1668191, r1668190, r1668189, r1667844, r1667843, r1667842, r1667841, r1667840, r1667839, r1667838, r1667837, r1667836, r1667835, r1667834, r1667833, r1667832, r1667830, r1667829, r1667828, r1667827, r1667826, r1667825, r1667453, r1667452, r1667451, r1667450, r1667449, r1667448, r1667447, r1667446, r1667445, r1667444, r1667443, r1667442, r1667441, r1667440, r1667439, r1667438, r1667172, r1666354, r1666080, r1666079, r1666078, r1666077, r1666076, r1664790, r1664789, r1664788, r1664787, r1664469, r1664463, r1664462, r1664460, r1661058, r1661057, r1660786, r1660563, r1660562, r1660561, r1660269, r1660025, r1660024, r1660023, r1660022, r1660021, r1660020, r1660019, r1659882, r1659881, r1659880, r1659879, r1659878, r1659877, r1659757, r1659756, r1659755, r1659754, r1659753, r1659752, r1659751, r1657744, r1657743, r1655931, r1655930, r1655929, r1651946, r1650718, r1643971, r1643970, r1643969, r1643968, r1643040, r1643032, r1643031, r1643030, r1643029, r1643028, r1643027, r1642638, r1642637, r1642636, r1642635, r1642634, r1642633, r1642632, r1642631, r1642630, r1642629, r1642628, r1642024, r1642023, r1641761, r1641030, r1641029, r1641028, r1640852, r1640851, r1640666, r1640665, r1640664, r1640663, r1640662, r1640661, r1640660, r1640659, r1640483, r1640482, r1640481, r1640480, r1640479, r1640478, r1617871, r1617870, r1616396, r1615221, r1615220, r1615204, r1615203, r1615202, r1615201, r1615200, r1615199, r1615198, r1615197, r1615196, r1615195, r1615194, r1615193, r1609004, r1609003, r1609002, r1609001, r1609000, r1606977, r1606976, r1605944, r1605567, r1589579, r1589578, r1589577, r1589576, r1589575, r1589574, r1589573, r1589572, r1589571, r1589570, r1589569, r1589568, r1589567, r1589566, r1589565, r1589564, r1589563, r1589335, r1589334, r1588153, r1588152, r1588151, r1588150, r1588149, r1588148, r1588147, r1588146, r1588145, r1586558, r1586557, r1586556, r1586555, r1585644, r1585643, r1582591, r1582590, r1582589, r1582588, r1581684, r1581683, r1579875, r1579874, r1579528, r1579130, r1579129, r1575659, r1575658, r1569626, r1569625, r1569624, r1569178, r1569177, r1568589, r1568588, r1567520, r1566500, r1564623, r1564622, r1564621, r1564620, r1564619, r1563372, r1562351, r1562350, r1562349, r1562348, r1562347, r1561585, r1561445, r1561444, r1561443, r1561442, r1561441, r1561252, r1559317, r1558692, r1558292, r1555656, r1555655, r1555654, r1555653, r1555652, r1555651, r1544739, r1544028, r1543706, r1541804, r1541803, r1541802, r1541801, r1541382, r1541381, r1541380, r1541379, r1540941, r1540441, r1540440, r1540439, r1540438, r1540437, r1539235, r1539234, r1538861, r1538860, r1538142, r1538141, r1538140, r1538139, r1538138, r1538137, r1538136, r1538135, r1536049, r1535275, r1534485, r1534484, r1534483, r1534482, r1534481, r1534480, r1534479, r1532178, r1530855, r1530854, r1530853, r1530852, r1530851, r1530850, r1530849, r1523183, r1520723, r1515704, r1515703, r1515702, r1515701, r1515700, r1515699, r1515698, r1515070, r1515069, r1515068, r1515067, r1514946, r1514945, r1514944, r1514943, r1514942, r1514941, r1514572, r1514152, r1514151, r1514150, r1514149, r1514148, r1513722, r1513335, r1513334, r1512559, r1512558, r1511573, r1511572, r1511571, r1511570, r1511569, r1507570, r1503555, r1503554, r1503553, r1503552, r1501642, r1501080, r1501079, r1501078, r1501077, r1501076, r1501075, r1501074, r1501073, r1501072, r1501071, r1501070, r1501069, r1501068, r1501067, r1501066, r1501065, r1501064, r1501063, r1501062, r1501061, r1501060, r1501059, r1501058, r1500572, r1499910, r1499909, r1499908, r1499196, r1499195, r1499194, r1499193, r1499192, r1499191, r1498772, r1498212, r1498060, r1497641, r1497206, r1496728, r1496727, r1496726, r1496725, r1496724, r1496723, r1495921, r1495920, r1495919, r1495918, r1495917, r1495282, r1495281, r1495280, r1495279, r1495278, r1494851, r1494850, r1494849, r1494441, r1494440, r1494439, r1494438, r1494437, r1494436, r1492044, r1491685, r1489702, r1489701, r1489700, r1489699, r1489698, r1489697, r1489282, r1488642, r1487719, r1487718, r1487717, r1487716, r1487715, r1487227, r1487226, r1487225, r1486733, r1486509, r1486508, r1486507, r1486506, r1486287, r1486286, r1486285, r1486284, r1486283, r1485366, r1485365, r1485364, r1485363, r1485362, r1485056, r1485055, r1485054, r1485053, r1485052, r1485051, r1485050, r1485049, r1485048, r1485047, r1485046, r1485045, r1483187, r1483186, r1482668, r1482197, r1482196, r1482195, r1482194, r1482193, r1482192, r1482191, r1482190, r1482189, r1482188, r1482187, r1477906, r1477905, r1477904, r1477903, r1477468, r1477467, r1477466, r1477465, r1477464, r1476486, r1476485, r1476484, r1471516, r1471515, r1471514, r1471513, r1471243, r1471242, r1471241, r1471240, r1471239, r1471238, r1470809, r1470808, r1470807, r1470806, r1470103, r1469682, r1469681, r1469680, r1469153, r1469152, r1469151, r1468302, r1468301, r1468161, r1468160, r1468149, r1468148, r1468147, r1468146, r1468145, r1461947, r1461946, r1461945, r1461944, r1461943, r1461407, r1461406, r1461405, r1461404, r1460965, r1460964, r1454652, r1454237, r1441698, r1435019, r1435018, r1434549, r1434548, r1428163, r1425401, r1425240, r1424799, r1424798, r1424285, r1424284, r1424283, r1421660, r1418182, r1417733, r1416767, r1411984, r1411983, r1411982, r1407352, r1407351, r1407350, r1403967, r1403966, r1403965, r1400757, r1400756, r1400361, r1400360, r1398635, r1398634, r1397428, r1393280, r1392728, r1392727, r1392726, r1391948, r1391749, r1391748, r1391747, r1391746, r1391745, r1391744, r1391743, r1391295, r1391294, r1391293, r1391292, r1389702, r1382817, r1382815, r1380973, r1380972, r1380971, r1380970, r1380969, r1377564, r1376823, r1371558, r1369261, r1369260, r1369259, r1368349, r1368348, r1368347, r1367857, r1367856, r1367855, r1367854, r1367853, r1367852, r1367851, r1362755, r1356567, r1355849, r1355703, r1355702, r1355701, r1355700, r1355699, r1355698, r1355631, r1355630, r1355629, r1355628, r1349818, r1349817, r1349816, r1349815, r1349814, r1337768, r1336475, r1336075, r1336074, r1336073, r1336072, r1336071, r1336070, r1331211, r1331210, r1331209, r1331208, r1331207, r1330653, r1330652, r1330651, r1330650, r1330649, r1330648, r1330647, r1328578, r1328577, r1327812, r1327811, r1326052, r1325606, r1325605, r1325604, r1325603, r1325602, r1306145, r1306144, r1306143, r1306142, r1305727, r1298264, r1296584, r1295405, r1295403, r1294966, r1293814, r1293813, r1293812, r1293811, r1293529, r1293528, r1293114, r1293113, r1293112, r1293111, r1242663, r1242662, r1242661, r1242660, r1241767, r1241344, r1240893, r1240892, r1240525

r1803756 | svn-role | 2017-08-01 23:00:41 -0500 (Tue, 01 Aug 2017)

Remove the '1.9.x-r1802316' branch, merged in r1803755.

r1803755 | svn-role | 2017-08-01 23:00:25 -0500 (Tue, 01 Aug 2017)

Merge the 1.9.x-r1802316 branch:

 * r1802080, r1802316
   Fix SEGV for 'svn export -rN WC' with relative externals.
   Justification:
     Client SEGV.
   Branch:
     ^/subversion/branches/1.9.x-r1802316
   Votes:
     +1: philip, danielsh, jamessan


r1803754 | svn-role | 2017-08-01 23:00:07 -0500 (Tue, 01 Aug 2017)

Merge r1796420 from trunk:

 * r1796420
   svnadmin: Canonicalize LOCK_PATH arguments.
   Justification:
     API violation; errors on valid input.
   Votes:
     +1: danielsh, rhuijben, jamessan


r1796970 | svn-role | 2017-05-30 23:00:06 -0500 (Tue, 30 May 2017)

Merge the r1667738 group from trunk:

 * r1667738, r1796720
   Properly follow redirects in JavaHL's RA connection.
   Justification:
     Makes JavaHL API conform to documented behaviour. See:
     https://lists.apache.org/thread.html/e56b957565f52b2d6b2bca00efb43db266d5eac6e6fb58aab5654a21@%3Cdev.subversion.apache.org%3E
   Votes:
     +1: brane, rhuijben


r1796725 | svn-role | 2017-05-29 23:00:07 -0500 (Mon, 29 May 2017)

Merge r1796158 from trunk:

 * r1796158
   Fix FSFS f7 metadata recording issue caused by the r1785053 backport.
   Justification:
     An obvious fix (one caller got the order of parameters mixed up).
     The bug is benign as non-deltifying property representations get
     marked as "file data reps".  This happens to be a valid state due
     to potential rep sharing, but defeats that is just lucky.
   Votes:
     +1: stefan2, danielsh, rhuijben


r1796471 | svn-role | 2017-05-27 23:00:23 -0500 (Sat, 27 May 2017)

Remove the '1.9.x-fix-fsfs' branch, merged in r1796470.

r1796470 | svn-role | 2017-05-27 23:00:08 -0500 (Sat, 27 May 2017)

Merge the 1.9.x-fix-fsfs branch:

 * r1796143 
   Fix the FSFS breakage caused by the latest SHA-1-related merges.
   Justification:
     FSFS is basically broken (~400 tests failing).
   Branch:
     ^/subversion/branches/1.9.x-fix-fsfs
   Votes:
     +1: stefan2, stsp, danielsh


r1795994 | svn-role | 2017-05-23 23:00:26 -0500 (Tue, 23 May 2017)

Remove the '1.9.x-strict-rep-sharing' branch, merged in r1795993.

r1795993 | svn-role | 2017-05-23 23:00:11 -0500 (Tue, 23 May 2017)

Merge the 1.9.x-strict-rep-sharing branch:

 * r1785737, r1785738, r1785734, r1786447, r1785754, r1786445, r1786446, r1786515, r1794530, r1794536, r1794611
   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: stsp, stefan2, rhuijben


r1791565 | svn-role | 2017-04-15 23:00:15 -0500 (Sat, 15 Apr 2017)

Merge r1706432 from trunk:

* 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, luke1410, stefan2


r1791564 | svn-role | 2017-04-15 23:00:12 -0500 (Sat, 15 Apr 2017)

Merge r1781655 from trunk:

 * 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, rhuijben, stefan2


r1791563 | svn-role | 2017-04-15 23:00:10 -0500 (Sat, 15 Apr 2017)

Merge r1781507 from trunk:

 * r1781507
   Fix a NULL deref in libsvn_repos which makes svndumpfilter crash.
   Justification:
     Should not crash. User complained.
   Votes:
     +1: stsp, rhuijben, stefan2


r1791562 | svn-role | 2017-04-15 23:00:07 -0500 (Sat, 15 Apr 2017)

Merge r1779948 from trunk:

 * 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, rhuijben, stefan2


r1787897 | svn-role | 2017-03-20 23:00:08 -0500 (Mon, 20 Mar 2017)

Merge r1774109 from trunk:

 * r1774109
   Document the purpose of 'svnadmin freeze' more clearly.
   Justification:
     Not very important, nice to have documentation fix. Trivial merge.
   Votes:
     +1: stsp, julianfoad
     +1: rhuijben (Doesn't need 3 votes. Documentation change only)


r1770614 | svn-role | 2016-11-20 22:01:46 -0600 (Sun, 20 Nov 2016)

Remove the '1.8.x-issue4658' branch, merged in r1770613.

r1770613 | svn-role | 2016-11-20 22:01:31 -0600 (Sun, 20 Nov 2016)

Merge the 1.8.x-issue4658 branch:

 * r1766352, r1766590
   Fix issue #4658: Can't reconstruct fulltext from DELTA against PLAIN in FSFS
   Justification:
     Prevents access to committed data.  This is as close to a corruption one
     could get without actually corrupting anything.  User reported issue.
   Branch:
     ^/subversion/branches/1.8.x-issue4658
   Notes:
     r1766352 contains the actual fix.
     r1766590 adds a test case for it.
   Votes:
     +1: stefan2, stsp, brane
     +0: rhuijben


r1770612 | svn-role | 2016-11-20 22:01:21 -0600 (Sun, 20 Nov 2016)

Remove the '1.8.x-r1724448' branch, merged in r1770611.

r1770611 | svn-role | 2016-11-20 22:01:05 -0600 (Sun, 20 Nov 2016)

Merge the 1.8.x-r1724448 branch:

 * r1724448, r1770355
   Fix handling of newly secured subdirectories in a working copy
   Justification:
     Regression against <= 1.6.x. Without this patch a directory that
     (still) exists locally but to which a user has no access is handled as
     a local obstruction on the next update that brings a change to this tree
     and the local working copy state is broken. This patch handles the
     incomming change as a delete, properly marking a tree conflict if
     necessary, allowing a user to make a copy of local changes.
     (Committing a copy would be hard though... as the user most likely
      doesn't have the rights to copy from what is now hidden).
   Branch:
     ^/subversion/branches/1.8.x-r1724448
   Notes:
     r1770355 fixes a test failure specific to the backport branch.
   Votes:
     +1: stsp, stefan2, brane
     +1: rhuijben (without r1770355)


r1770610 | svn-role | 2016-11-20 22:00:56 -0600 (Sun, 20 Nov 2016)

Remove the '1.8.x-portability' branch, merged in r1770609.

r1770609 | svn-role | 2016-11-20 22:00:40 -0600 (Sun, 20 Nov 2016)

Merge the 1.8.x-portability branch:

 * r1722860, r1722879, r1722887
   Memory access portability issues.
   Justification:
     Not complying to the C standard is bad.  At the very least we
     improve the signal/noise ratio when using memory sanitizers.
     Part of this patch set (r1722879) fixes a crash on SPARC that
     apparently gets masked by some lucky caller pattern.
     Finally, these changes make the code actually simpler.
   Notes:
     r1722860 fixes the issue originally reported on dev@.
     r1722879 fixes a follow-up issue found by the SPARC buildbot.
     r1722887 removes similar logic from the membuffer cache although
              that had not been reported a faulty.
   Branch:
     ^/subversion/branches/1.8.x-portability
   Votes:
     +1: stefan2, stsp
     +1: brane, however: [[[
         subversion/libsvn_subr/utf_validate.c:273:28: warning: comparison of constant 128 with expression
               of type 'const char' is always false [-Wtautological-constant-out-of-range-compare]
             if (*data < 0 || *data >= 0x80)
                              ~~~~~ ^  ~~~~
         This is happily not exactly a bug because the '< 0' branch will
         catch these cases, but it's really messy ...]]]


r1770608 | svn-role | 2016-11-20 22:00:31 -0600 (Sun, 20 Nov 2016)

Merge the r1717875 group from trunk:

 * r1717875, r1717878
   Make inherited property api consistent over all ra layers
   Justification:
     Our ra implementations should follow the documentation... and should
     be as consistent as possible between each other. Only because the
     caller uses svn_path_url_add_component2() this wasn't noticed by
     our code.
   Notes:
     A test for this issue was added in r1717874, but requires plumbing
     that isn't available on 1.8.x
   Votes:
     +1: rhuijben, stefan2, brane


r1770607 | svn-role | 2016-11-20 22:00:27 -0600 (Sun, 20 Nov 2016)

Remove the '1.8.x-issue4557' branch, merged in r1770606.

r1770606 | svn-role | 2016-11-20 22:00:12 -0600 (Sun, 20 Nov 2016)

Merge the 1.8.x-issue4557 branch:

 * r1663500
   Fix issue #4557, "ra_serf fails to delete directory containing many files"
   Justification:
     Regression introduced in 1.8.10.
   Notes:
     The associated test is still failing because it was extended to check
     COPY as well as DELETE. Issue #4557 is just about DELETE requests.
   Branch:
     ^/subversion/branches/1.8.x-issue4557
   Votes:
     +1: stsp, stefan2, brane


r1770462 | svn-role | 2016-11-18 22:00:06 -0600 (Fri, 18 Nov 2016)

Merge the r1762338 group from trunk:

 * r1762338, r1762339, r1769973
   Fix issue #4655: add zlib discovery through pkg-config.
   Justification:
     Allows building Subversion with non-default zlib layouts, such as
     with libraries in $zlib_prefix/lib/hpux32 on HP-UX.
   Votes:
     +1: stsp, brane, kotkov
     +0: rhuijben (patch looks good. Untested) (+1 for r1769973)


r1770308 | svn-role | 2016-11-17 22:01:08 -0600 (Thu, 17 Nov 2016)

Merge the 1.9.x-fsfs-pack-fixes@r1770158 branch:

 * r1759117, r1759122, r1759123, r1759124, 1764676
   Fix issue #4657: "Offset too large" error when packing repository in
   FSFS 7 format.
   Justification:
     Problem occurred in at least two user repositories.  Without the fix,
     format 7 repositories with an exceptionally large number of changes in
     a pack cannot be packed - which renders using f7 pointless for those
     users.
   Branch:
     ^/subversion/branches/1.9.x-fsfs-pack-fixes@r1770158
   Notes:
     r1759117-23 provide the actual fixes.
     r1759124 adds a regression test with the necessary internal API changes.
     r1764676 eliminates our reliance on the currently broken APR trunc().
   Votes:
     +1: stefan2, stsp, rhuijben


r1770307 | svn-role | 2016-11-17 22:01:03 -0600 (Thu, 17 Nov 2016)

Merge the r1766699 group from trunk:

 * r1766699, r1766704, r1766711
   Fix a bug where reintegrate merges access a non-existent path and error out.
   Justification:
     This problem can prevent reintegration of branches in some situations.
     Advanced users can fall back to a 2-URL merge but most users won't
     realize how they can work around the problem.
   Votes:
     +1: stsp, rhuijben, stefan2


r1770306 | svn-role | 2016-11-17 22:00:59 -0600 (Thu, 17 Nov 2016)

Remove the '1.8.x-r1724448' branch, merged in r1770305.

r1770305 | svn-role | 2016-11-17 22:00:44 -0600 (Thu, 17 Nov 2016)

Merge the 1.8.x-r1724448 branch:

 * r1724448
   Fix handling of newly secured subdirectories in a working copy
   Justification:
     Regression against <= 1.6.x. Without this patch a directory that
     (still) exists locally but to which a user has no access is handled as
     a local obstruction on the next update that brings a change to this tree
     and the local working copy state is broken. This patch handles the
     incomming change as a delete, properly marking a tree conflict if
     necessary, allowing a user to make a copy of local changes.
     (Committing a copy would be hard though... as the user most likely
      doesn't have the rights to copy from what is now hidden).
   Branch:
     ^/subversion/branches/1.8.x-r1724448
   Votes:
     +1: rhuijben, stefan2, stsp


r1770304 | svn-role | 2016-11-17 22:00:37 -0600 (Thu, 17 Nov 2016)

Merge r1711346 from trunk:

 * r1711346
   Properly remove tempfiles in svnlook on diff errors such as EPIPE.
   Justification:
     Simple fix makes it far less likely that tempfiles are left behind
     on the server.
   Votes:
     +1: rhuijben, stefan2, stsp


r1770303 | svn-role | 2016-11-17 22:00:34 -0600 (Thu, 17 Nov 2016)

Merge r1706783 from trunk:

 * r1706783
   Really pass patch result to svn_client_patch() filter 
   Justification:
     Without this fix the filter can't determine the result of a patch.
   Notes:
     Merge conflicts if a trunk client is used.
   Votes:
     +1: rhuijben, stefan2, stsp


r1770302 | svn-role | 2016-11-17 22:00:31 -0600 (Thu, 17 Nov 2016)

Remove the '1.8.x-r1764851' branch, merged in r1770301.

r1770301 | svn-role | 2016-11-17 22:00:16 -0600 (Thu, 17 Nov 2016)

Merge the 1.8.x-r1764851 branch:

 * r1764851
   Fix temporary accepting an SSL server certificate in JavaHL
   Justification:
     User reported problem. Simple fix.
   Branch:
     ^/subversion/branches/1.8.x-r1764851
   Notes:
     The code was refactored for 1.9.x. Old versions of neon and serf
     didn't properly verify the accepted failures values.
   Votes:
     +1: rhuijben, stefan2, brane


r1770300 | svn-role | 2016-11-17 22:00:08 -0600 (Thu, 17 Nov 2016)

Merge r1761334 from trunk:

 * r1761334
   Fix issue #4653: SVN_LOCALE_DIR incorrectly interpolated when
   prefix is not set explicitly.
   Justification:
     ./configure with no arguments should just work.
   Votes:
     +1: brane, stsp, stefan2


r1770299 | svn-role | 2016-11-17 22:00:06 -0600 (Thu, 17 Nov 2016)

Merge r1728387 from trunk:

 * r1728387
   Fix issue 4611, gpg-agent and passwords with a percent character.
   Justification:
     Some passwords don't work.
   Votes:
     +1: philip, stefan2, brane


r1770113 | svn-role | 2016-11-16 22:00:20 -0600 (Wed, 16 Nov 2016)

Merge r1761334 from trunk:

 * r1761334
   Fix issue #4653: SVN_LOCALE_DIR incorrectly interpolated when
   prefix is not set explicitly.
   Justification:
     ./configure with no arguments should just work.
   Votes:
     +1: brane, stsp, stefan2
     +0: rhuijben (patch looks safe, but not sure enough for +1)


r1770112 | svn-role | 2016-11-16 22:00:18 -0600 (Wed, 16 Nov 2016)

Merge r1769152 from trunk:

 * r1769152
   Make hook script environments actually work with svnserve.
   Justification:
     svnserve should enable this feature just like mov_dav_svn and ra_local do.
     User complained.
   Votes:
     +1: stsp, rhuijben, stefan2


r1770111 | svn-role | 2016-11-16 22:00:16 -0600 (Wed, 16 Nov 2016)

Merge r1724448 from trunk:

 * r1724448
   Fix handling of newly secured subdirectories in a working copy
   Justification:
     Regression against <= 1.6.x. Without this patch a directory that
     (still) exists locally but to which a user has no access is handled as
     a local obstruction on the next update that brings a change to this tree
     and the local working copy state is broken. This patch handles the
     incoming change as a delete, properly marking a tree conflict if
     necessary, allowing a user to make a copy of local changes.
     (Committing a copy would be hard though... as the user most likely
      doesn't have the rights to copy from what is now hidden).
   Votes:
     +1: rhuijben, stsp, stefan2


r1770110 | svn-role | 2016-11-16 22:00:14 -0600 (Wed, 16 Nov 2016)

Merge the r1766352 group from trunk:

 * r1766352, r1766590
   Fix issue #4658: Can't reconstruct fulltext from DELTA against PLAIN in FSFS
   Justification:
     Prevents access to committed data.  This is as close to a corruption one
     could get without actually corrupting anything.  User reported issue.
   Notes:
     r1766352 contains the actual fix.
     r1766590 adds a test case for it.
     The merge conflicts if a trunk client is used! 
   Votes:
     +1: stefan2, rhuijben, stsp


r1770109 | svn-role | 2016-11-16 22:00:11 -0600 (Wed, 16 Nov 2016)

Merge r1769456 from trunk:

* r1769456
  Fix issue #4660: svn info --show-item=revision contains trailing whitespaces.
  Justification:
    Having trailing whitespaces in the output complicates the usage in scripts
    which is one of the main purposes of the new --show-item option.
  Votes:
    +1 (non-binding): luke1410
    +1: rhuijben, danielsh (via IRC), stsp


r1770108 | svn-role | 2016-11-16 22:00:09 -0600 (Wed, 16 Nov 2016)

Merge r1760570 from trunk:

 * r1760570
   Fix a spurious 'incoming edit' tree conflict with an unmodified file.
   Justification:
     Tree conflicts should not be raised unnecessarily.
   Notes:
     Depends on r1734106 to be merged first to avoid a text conflict
     in the test suite code.
   Votes:
     +1: stsp, stefan2, rhuijben


r1770107 | svn-role | 2016-11-16 22:00:06 -0600 (Wed, 16 Nov 2016)

Merge r1734106 from trunk:

 * r1734106
   Fix a bug where the wrong source left revision was recorded in a tree
   conflict.
   Justification:
     Conflict info recorded in WC should be correct.
     Fix will help users who upgrade to 1.10 with conflicts recorded in WC.
     Also, merging this allows r1760570 to merge cleanly.
   Votes:
     +1: stsp, rhuijben, stefan2


r1769562 | svn-role | 2016-11-13 22:00:09 -0600 (Sun, 13 Nov 2016)

Merge r1766327 from trunk:

 * r1766327
   Improve discovery of gpg-agent sockets.
   Justification:
     Honor the user's request to use a different gpg configuration/home
     directory
   Votes:
     +1: jamessan, rhuijben, stefan2


r1769561 | svn-role | 2016-11-13 22:00:07 -0600 (Sun, 13 Nov 2016)

Merge r1766323 from trunk:

 * r1766323
   Unconditionally call bye_gpg_agent when we're done with gpg-agent to fix a
   file descriptor leak.
   Justification:
     Fixes a file descriptor leak
   Votes:
     +1: jamessan, rhuijben, stefan2


r1767988 | svn-role | 2016-11-03 23:00:11 -0500 (Thu, 03 Nov 2016)

Merge r1767768 from trunk:

 * r1767768
   Fix for "Perl bindings corrupt "{DATE}" revision variable"
   Justification:
     User reported problem. Simple fix.
   Votes:
     +1: rschupp
     +0: danielsh, rhuijben


r1767987 | svn-role | 2016-11-03 23:00:07 -0500 (Thu, 03 Nov 2016)

Merge r1767768 from trunk:

 * r1767768
   Fix for "Perl bindings corrupt "{DATE}" revision variable"
   Justification:
     User reported problem. Simple fix.
   Votes:
     +1: rschupp
     +0: danielsh, rhuijben


r1766621 | svn-role | 2016-10-25 23:00:06 -0500 (Tue, 25 Oct 2016)

Merge r1766240 from trunk:

 * r1766240
   Fix a test failure in Ruby bindings due to modifying a frozen object
   (NilClass)
   Justification:
     Fixes ruby test failures with ruby >= 2.2
   Votes:
     +1: jamessan
     +0: rhuijben


r1765386 | svn-role | 2016-10-17 23:00:09 -0500 (Mon, 17 Oct 2016)

Merge r1764851 from trunk:

 * r1764851
   Fix temporary accepting an SSL server certificate in JavaHL
   Justification:
     User reported problem. Simple fix.
   Votes:
     +1: rhuijben, brane


r1765385 | svn-role | 2016-10-17 23:00:07 -0500 (Mon, 17 Oct 2016)

Merge r1761755 from trunk:

 * r1761755
   Fix link error with --disable-keychain behavior on OS/X
   Justification:
     User reported problem. Easy fix.
   Votes:
     +1: rhuijben, stefan2, brane


r1765006 | svn-role | 2016-10-14 23:00:06 -0500 (Fri, 14 Oct 2016)

Merge the r1758128 group from trunk:

* r1758128, r1758129, r1758130, r1758153
  Fix issue #4647.
  Justification:
    Resolves a regression in TSVN 1.9 with the binary conflict resolution
    dialog erroring out when selecting to resolve the conflict with the
    local file.
  Notes:
    r1758129 contains the actual fix.
    r1758153 corrects paths in the original fix.
    r1758128 adds the regression test.
    r1758130 removes the regression test's XFail marker
  Votes:
    +1 (non-binding): luke1410
    +1: stsp, stefan2, rhuijben


r1764640 | svn-role | 2016-10-13 04:25:21 -0500 (Thu, 13 Oct 2016)

Merge r1721285 from trunk:

 * r1721285
   Quadruple the maximum cacheable directory size in FSFS.
   Justification:
     Not caching large directories has a massive impact on runtime with
     the cutoff point being about 9000 entries for the default cache size.
     Also, memory usage with mod_dav_svn may go through the roof for
     uncached directories.
   Votes:
     +1: stefan2, steveking, jcorvel


r1764639 | svn-role | 2016-10-13 04:25:18 -0500 (Thu, 13 Oct 2016)

Remove the '1.9.x-r1721488' branch, merged in r1764638.

r1764638 | svn-role | 2016-10-13 04:25:03 -0500 (Thu, 13 Oct 2016)

Merge the 1.9.x-r1721488 branch:

 * r1721488, r1721648
   Enable building bindings with SWIG >= 3.0.6
   Justification:
     Enable building bindings with SWIG 3.x.  SWIG 2.x is end-of-life (no
     releases since 2014) and is starting to be removed from Linux
     distributions.
   Branch:
     ^/subversion/branches/1.9.x-r1721488
   Votes:
     +1: jamessan, stefan2


r1764637 | svn-role | 2016-10-13 04:24:59 -0500 (Thu, 13 Oct 2016)

Merge r1722164 from trunk:

 * r1722164
   Filter out -Wdate-time from SWIG_CPPFLAGS
   Justification:
     Fixes bindings build failure when -Wdate-time is present in $CPPFLAGS
   Votes:
     +1: jamessan, stefan2
     +1: rhuijben (Would prefer some redesign for trunk though)


r1764574 | svn-role | 2016-10-12 23:01:13 -0500 (Wed, 12 Oct 2016)

[Note from the future: reverted in r1764633, to fix backport mixup]
Merge r1721285 from trunk:

 * r1721285
   Quadruple the maximum cacheable directory size in FSFS.
   Justification:
     Not caching large directories has a massive impact on runtime with
     the cutoff point being about 9000 entries for the default cache size.
     Also, memory usage with mod_dav_svn may go through the roof for
     uncached directories.
   Votes:
     +1: stefan2, steveking, jcorvel


r1764573 | svn-role | 2016-10-12 23:01:10 -0500 (Wed, 12 Oct 2016)

[Note from the future: reverted/resurrected in r1764631]
Remove the '1.9.x-r1721488' branch, merged in r1764572.

r1764572 | svn-role | 2016-10-12 23:00:54 -0500 (Wed, 12 Oct 2016)

[Note from the future: reverted in r1764633, to fix backport mixup]
Merge the 1.9.x-r1721488 branch:

 * r1721488, r1721648
   Enable building bindings with SWIG >= 3.0.6
   Justification:
     Enable building bindings with SWIG 3.x.  SWIG 2.x is end-of-life (no
     releases since 2014) and is starting to be removed from Linux
     distributions.
   Branch:
     ^/subversion/branches/1.9.x-r1721488
   Votes:
     +1: jamessan, stefan2


r1764571 | svn-role | 2016-10-12 23:00:49 -0500 (Wed, 12 Oct 2016)

[Note from the future: reverted in r1764633, to fix backport mixup]
Merge r1722164 from trunk:

 * r1722164
   Filter out -Wdate-time from SWIG_CPPFLAGS
   Justification:
     Fixes bindings build failure when -Wdate-time is present in $CPPFLAGS
   Votes:
     +1: jamessan, stefan2
     +1: rhuijben (Would prefer some redesign for trunk though)


r1764570 | svn-role | 2016-10-12 23:00:47 -0500 (Wed, 12 Oct 2016)

[Note from the future: reverted in r1764633, to fix backport mixup]
Merge r1764034 from trunk:

 * r1764034
   Use 'Apache Software Foundation' instead of 'http://subversion.apache.org'
   as CompanyName/Publisher for Windows executables.
   Justification:
     Minor tweak that makes Subversion look a little bit better in Windows
     Task Manager.
   Votes:
     +1: ivan, brane, stefan2


r1764569 | svn-role | 2016-10-12 23:00:45 -0500 (Wed, 12 Oct 2016)

[Note from the future: reverted in r1764633, to fix backport mixup]
Merge r1763934 from trunk:

 * r1763934
   Add the OSX 10.12 commercial name for 'svn --version --verbose'.
   Justification:
     Very minor change makes SVN look slightly more polished.
   Votes:
     +1: brane, ivan, stefan2


r1764568 | svn-role | 2016-10-12 23:00:42 -0500 (Wed, 12 Oct 2016)

Merge r1764034 from trunk:

 * r1764034
   Use 'Apache Software Foundation' instead of 'http://subversion.apache.org'
   as CompanyName/Publisher for Windows executables.
   Justification:
     Minor tweak that makes Subversion look a little bit better in Windows
     Task Manager.
   Votes:
     +1: ivan, brane, stefan2


r1764567 | svn-role | 2016-10-12 23:00:37 -0500 (Wed, 12 Oct 2016)

Merge r1763934 from trunk:

 * r1763934
   Add the OSX 10.12 commercial name for 'svn --version --verbose'.
   Justification:
     Very minor change makes SVN look slightly more polished.
   Votes:
     +1: brane, ivan, stefan2


r1764566 | svn-role | 2016-10-12 23:00:33 -0500 (Wed, 12 Oct 2016)

Remove the '1.8.x-r1702299' branch, merged in r1764565.

r1764565 | svn-role | 2016-10-12 23:00:17 -0500 (Wed, 12 Oct 2016)

Merge the 1.8.x-r1702299 branch:

 * r1702299, r1702300, r1702397, r1702407, r1702565
   Handle merging to local add as error instead of segfault.
   Justification:
     Segfault. User reported.
   Notes:
     r1702299 adds a testcase.
     r1702397 fixes the problem with automatic merge and updates the test.
     r1702565 fixes a quite similar segfault with --reintegrate merge.
     The other revisions are minor cleanup.
   Branch:
     ^/subversion/branches/1.8.x-r1702299
   Votes:
     +1: rhuijben, julianfoad, stefan2


r1761670 | svn-role | 2016-09-20 23:00:33 -0500 (Tue, 20 Sep 2016)

Merge r1761653 from trunk:

 * r1761653
   Fix typo in SVN_REPOS__HOOK_POST_LOCK description
   Justification:
     Obvious fix
   Votes:
     +1: jamessan


r1759934 | svn-role | 2016-09-08 23:00:26 -0500 (Thu, 08 Sep 2016)

Merge r1759686 from trunk:

 * r1759686
   Don't crash in FSFS on representations with all-zero checkusms.
   Justification:
     Very simple fix.  Some very old repositories might contain all-0 SHA1
     due to bugs in older releases.  Handle them gracefulle and don't crash.
   Votes:
     +1: stefan2, ivan, rhuijben


r1759197 | svn-role | 2016-09-04 23:00:18 -0500 (Sun, 04 Sep 2016)

Merge r1756266 from trunk:

 * r1756266
   FSFS: Write the sha1->rep mapping in transaction *after* we successfully
   written node revision to disk. Otherwise may get orphaned sha1->rep mapping
   entry if an error occurs when writing p2l index entry.
   Justification:
     Possible repository corruption.
     NOTE: Standard Subversion client should not be affected because it
     aborts transaction on any error.
   Votes:
     +1: ivan, rhuijben, stefan2


r1759051 | svn-role | 2016-09-02 23:00:26 -0500 (Fri, 02 Sep 2016)

Merge r1758781 from trunk:

 * r1758781
   Fix a bug in mod_dav_svn's MERGE handler that can cause malformed
   responses.
   Justification:
     Fixes a bug that can cause unexpected errors during 'svn commit' over
     http://.  This is a follow-up to the '1.9.x-r1758224-group' nomination
     merged in r1758694.
   Votes:
     +1: kotkov, rhuijben, ivan


r1758874 | svn-role | 2016-09-01 23:00:30 -0500 (Thu, 01 Sep 2016)

Merge r1715777 from trunk:

 * r1715777
   Convert assertion failure to error if configuration file contains just one
   0xEE character.
   Justification:
     Assertion on invalid config is not good behavior.
   Votes:
     +1: ivan, rhuijben, kotkov


r1758696 | svn-role | 2016-08-31 23:00:52 -0500 (Wed, 31 Aug 2016)

Merge r1758269 from trunk:

 * r1758269
   Fix issue #4652.
   Justification:
     We should return error messages when users provide invalid input, instead
     of creating a core dump.
   Votes:
     +1 stsp, ivan, rhuijben


r1758695 | svn-role | 2016-08-31 23:00:47 -0500 (Wed, 31 Aug 2016)

Remove the '1.9.x-r1758224-group' branch, merged in r1758694.

r1758694 | svn-role | 2016-08-31 23:00:31 -0500 (Wed, 31 Aug 2016)

Merge the 1.9.x-r1758224-group branch:

 * r1758202, r1758204, r1758207, r1758209, r1758224, r1758385
   Fix unbounded memory usage when mod_dav_svn is paired with mod_headers
   or mod_deflate.
   Justification:
     Resolves a long-standing memory usage issue that can make Subversion
     unusable with a seemingly harmless server configuration.  User
     reported (issue #3084).
   Branch:
     ^/subversion/branches/1.9.x-r1758224-group
   Notes:
     r1758202 is included to avoid unnecessary conflicts.
     r1758204, r1758207, r1758209 and r1758385 lay the necessary
     groundwork for the fix.
     r1758224 is the fix itself.
     .
     The backport branch is required, because of the text conflicts in
     mod_dav_svn/repos.c and mod_dav_svn/merge.c.
   Votes:
     +1: kotkov, ivan, rhuijben


r1757937 | svn-role | 2016-08-26 23:01:02 -0500 (Fri, 26 Aug 2016)

Remove the '1.9.x-r1757529-group' branch, merged in r1757936.

r1757936 | svn-role | 2016-08-26 23:00:45 -0500 (Fri, 26 Aug 2016)

Merge the 1.9.x-r1757529-group branch:

 * r1757529, r1757532, r1757539
   mod_dav_svn: Fix unbounded memory usage when handling GET requests
   and properly buffer their responses.
   Justification:
     Fixes an unbounded memory usage in skelta mode(default for some client
     versions) configuration. Proper buffering reduces the amount of data
     sent over the wire by passing larger chunks to the httpd's chunking
     filter.
   Branch:
     ^/subversion/branches/1.9.x-r1757529-group
   Notes:
     The backport branch is required, because r1757529 produces a text conflict
     in a comment in mod_dav_svn/repos.c
   Votes:
     +1: kotkov, rhuijben, ivan


r1757781 | svn-role | 2016-08-25 23:01:22 -0500 (Thu, 25 Aug 2016)

Merge r1748514 from trunk:

 * r1748514
   Fix a crash in 'svn resolve'.
   Justification:
     SVN should not segfault. User complained.
   Votes:
     +1: stsp, jamessan, rhuijben


r1757780 | svn-role | 2016-08-25 23:01:14 -0500 (Thu, 25 Aug 2016)

Remove the '1.9.x-rep-cache-db-fixes' branch, merged in r1757779.

r1757779 | svn-role | 2016-08-25 23:00:58 -0500 (Thu, 25 Aug 2016)

Merge the 1.9.x-rep-cache-db-fixes branch:

 * r1663286, r1741071, r1741072, r1741073, r1741078, r1741096, r1741200,
   r1741206
   Fix the source of "database is locked" errors when opening rep-cache.db.
   Justification:
     Users can get unexpected errors during operations that open rep-cache.db,
     e.g., when calling 'svnadmin verify'.
   Branch:
     ^/subversion/branches/1.9.x-rep-cache-db-fixes
   Notes:
     r1663286 only affects maintainer mode and is included to avoid conflicts.
     r1741073 fixes a potential crash in our sqlite helper.
     r1741096 and r1741200 are the core fix for this issue.
     r1741206 fixes a potential problem with the long-living db connection.
     .
     The backport branch is required, because r1741096 adds a new error code
     that can't be backported as is without breaking compatibility between
     patch versions.
   Votes:
     +1: kotkov, ivan, rhuijben


r1755139 | svn-role | 2016-08-03 23:00:43 -0500 (Wed, 03 Aug 2016)

Merge the r1700130 group from trunk:

 * r1700130, r1745515, r1746364
   Update serf download URIs to ASF.
   Justification:
     Resolves build script issues since the old google code URI is 404 now.
   Votes:
     +1 (non-binding): luke1410 (without r1700130)
     +1: jamessan
     +1: ivan


r1751208 | svn-role | 2016-07-03 23:00:57 -0500 (Sun, 03 Jul 2016)

Merge the r1683266 group from trunk:

 * r1683266, r1683267
   Avoid possible stack corruption in swig-perl (see also r1683266)
   Justification:
     These changes go deeper than r1683266 where the possibility that the
     Perl stack is re-allocated "from under us" is in plain sight.
     They bracket calls to functions svn_swig_pl_make_pool and 
     svn_swig_pl_callback_thunk that call back into Perl which
     meaning that somewhere even further down the call chain
     Perl may re-allocate its stack. Note that calling PUTBACK or SPAGAIN
     is never wrong, it might just be not necessary (if we can prove that 
     the cached stack pointer (SP) can't change in between).
   Votes:
     +1: rschupp, jamessan


r1751207 | svn-role | 2016-07-03 23:00:50 -0500 (Sun, 03 Jul 2016)

Merge the r1663253 group from trunk:

 * r1663253, r1704821, r1738659, r1738828
   Fix a few instances of undefined behavior in Win32 crash reporter.
   Justification:
     Potentially crashing in a crash reporter is bad.
   Votes:
     +1: kotkov, ivan, jamessan


r1751206 | svn-role | 2016-07-03 23:00:43 -0500 (Sun, 03 Jul 2016)

Merge r1741401 from trunk:

 * r1741401
   Add the OSX 10.11 commercial name for 'svn --version --verbose'.
   Justification:
     Minor cosmetic change, but it should have been done before the 1.9.0
     release since OSX 10.11 was released first.
   Votes:
     +1: brane, kotkov, jamessan


r1751205 | svn-role | 2016-07-03 23:00:39 -0500 (Sun, 03 Jul 2016)

Merge r1683266 from trunk:

 * 1683266
   Resolve stack corruption in swig-perl
   Justification:
     User requested fix. Breaks git's svn clone support in some
     use-cases. See
     http://www.mail-archive.com/git@vger.kernel.org/msg97227.html
   Votes:
     +0: rhuijben
     +1: stsp
     +1: rschupp


r1751204 | svn-role | 2016-07-03 23:00:26 -0500 (Sun, 03 Jul 2016)

Merge r1683266 from trunk:

 * r1683266
   Resolve stack corruption in swig-perl
   Justification:
     User requested fix. Breaks git's svn clone support in some
     use-cases. See
     http://www.mail-archive.com/git@vger.kernel.org/msg97227.html
   Votes:
     +1: rschupp, stsp


r1746374 | svn-role | 2016-05-31 23:00:41 -0500 (Tue, 31 May 2016)

Merge r1746053 from trunk:

* r1746053
  Correct issue reference in 1.8.0 changelog.
  Justification:
    Changelog should not point to a wrong issue number.
  Votes:
    +1: luke1410
    +1: stsp (IMO this could just be an "ovious fix" commit to the branch)


r1746373 | svn-role | 2016-05-31 23:00:26 -0500 (Tue, 31 May 2016)

Merge r1746053 from trunk:

* r1746053
  Correct issue reference in 1.8.0 changelog.
  Justification:
    Changelog should not point to a wrong issue number.
  Votes:
    +1: luke1410
    +1: stsp (IMO this could just be an "ovious fix" commit to the branch)


r1743454 | svn-role | 2016-05-11 23:00:34 -0500 (Wed, 11 May 2016)

Merge r1720015 from trunk:

 * r1720015
   Fix undefined behavior when opening an FSFS repository without db/format.
   Justification:
     Unbreaks working with 1.1-era repositories that didn't have this file.
   Votes:
     +1: kotkov, danielsh, ivan


r1739685 | svn-role | 2016-04-17 23:00:29 -0500 (Sun, 17 Apr 2016)

Merge the r1717874 group from trunk:

 * r1717874, r1717875, r1717878, r1716808
   Make inherited property api consistent over all ra layers
   Justification:
     Our ra implementations should follow the documentation... and should
     be as consistent as possible between each other. Only because the
     caller uses svn_path_url_add_component2() this wasn't noticed by
     our code.
   Notes:
     r1716808 needed for SVN_TEST_INT_ASSERT macro. I think it makes
     sense to backport this change to simplify future backports.
   Votes:
     +1: steveking (without r1716808)
     +1: ivan, rhuijben, stefan2


r1739684 | svn-role | 2016-04-17 23:00:23 -0500 (Sun, 17 Apr 2016)

Merge r1735179 from trunk:

 * r1735179
   build system: Improve svn_error_symbolic_name()'s data gatherer.
   Justification:
     The incumbent warning message is unclear and might have false positives.
   Votes:
     +1: danielsh, stsp, stefan2


r1739399 | svn-role | 2016-04-15 23:01:28 -0500 (Fri, 15 Apr 2016)

Merge the r1663500 group from trunk:

 * r1663500, r1737122, r1739278, r1739280
   Fix issue #4557, "ra_serf fails to delete directory containing many files"
   Justification:
     Regression introduced in 1.8.10.
   Votes:
     +1: stsp, ivan, rhuijben


r1739398 | svn-role | 2016-04-15 23:01:19 -0500 (Fri, 15 Apr 2016)

Remove the '1.9.x-r1725180' branch, merged in r1739397.

r1739397 | svn-role | 2016-04-15 23:01:03 -0500 (Fri, 15 Apr 2016)

Merge the 1.9.x-r1725180 branch:

 * r1725180
   Reduce peak memory usage when listing large directories in FSFS.
   Justification:
     Allocating large blocks through APR has unpleasant side-effects
     for the allocation pattern used in mod_dav's request processing.
     Also, there is simply no point in serializing data that wouldn't
     make it into the cache after all.
   Branch:
     ^/subversion/branches/1.9.x-r1725180
   Votes:
     +1: stefan2, steveking, stsp


r1739396 | svn-role | 2016-04-15 23:00:38 -0500 (Fri, 15 Apr 2016)

Merge the r1703470 group from trunk:

 * r1703470, r1703475
   Updated INSTALL documentation.
   Justification:
     Corrects outdated statement.
   Votes:
     +1: luke1410
     +0: rhuijben (Documentation only change)


r1739395 | svn-role | 2016-04-15 23:00:32 -0500 (Fri, 15 Apr 2016)

Merge r1714790 from trunk:

 * r1714790
   Fix ruby test suite to work with test-unit gem.
   Justification:
     Ruby test suite would simply not run on Ubuntu 15.10.
     The patch is limited to rb test suite code only.
   Votes:
     +1: stefan2, jamessan, rhuijben


r1739394 | svn-role | 2016-04-15 23:00:27 -0500 (Fri, 15 Apr 2016)

Merge r1539230 from trunk:

 * r1539230
   Make JAVAHL tests pass on symlinked ramdiscs.
   Justification:
     We will support 1.8.x for quite some time still.  So, if a low-risk
     patch avoids confusion during release signing etc., I think it is
     worth it.  The patch is limited to JAVAHL test code only.
   Votes:
     +1: stefan2, brane
     +0.5: rhuijben (Simple fix to bindings, doesn't require full review but
                     looks good)


r1738890 | svn-role | 2016-04-12 23:00:24 -0500 (Tue, 12 Apr 2016)

Merge the r1704292 group from trunk:

 * r1704292, r1704573
   Make svn diff --git produce proper forward binary diffs
   Justification:
     Applying accidental reverse diffs might work for git, but isn't
     going to work for our 1.10 'svn patch' implementation.
     .
     Without this patch we produce a diff transforming the result file
     to the original file.
   Votes:
     +1: rhuijben, jamessan, ivan


r1738681 | svn-role | 2016-04-11 23:00:28 -0500 (Mon, 11 Apr 2016)

Merge r1738259 from trunk:

 * r1738259
   Fix out of bounds read when sizeof(svn_revnum_t) < sizeof(svn_revnum_t *).
   Justification:
     Undefined behaviour.
   Votes:
     +1: danielsh, ivan, rhuijben


r1737911 | svn-role | 2016-04-05 23:00:58 -0500 (Tue, 05 Apr 2016)

Merge r1736432 from trunk:

 * r1736432
   Fix failure in update_tests.py#76 with SVNPathAuthz short_circuit.
   Justification:
     Tests should not fail.
   Votes:
     +1: kotkov, ivan, rhuijben


r1737910 | svn-role | 2016-04-05 23:00:53 -0500 (Tue, 05 Apr 2016)

Merge r1735826 from trunk:

 * r1735826
   Make SIGINT abort a commit, even at the interactive plaintext prompt.
   (Issue #4624.)
   Justification:
     Can result in unintended commits (users expect ^C to abort the commit).
   Notes:
     r1735826 is the merge to trunk of r1735680 from the 1.9.x branch.
     Some older versions of 'svn merge' would make the merge of r1735826
     to 1.9.x a noop merge.  (1.8.9 does; 1.8.15 does not.)  Consequently,
     this entry must be merged by a sufficiently new svn.
     .
     'svn-role' uses a sufficiently new svn (1.9.3).
   Votes:
     +1: danielsh, ivan, rhuijben


r1737909 | svn-role | 2016-04-05 23:00:32 -0500 (Tue, 05 Apr 2016)

Merge r1708699 from trunk:

 * 1708699
   Fix authz with mandatory authn provided by mod_auth_kerb/mod_auth_ntlm.
   Justification:
     Regression introduced in 1.8.14.
   Votes:
     +1: philip, rhuijben, jamessan


r1736942 | svn-role | 2016-03-28 23:00:30 -0500 (Mon, 28 Mar 2016)

Merge r1730856 from trunk:

 * r1730856
   Provide a (hopefully) better documentation for the AuthzSVNGroupsFile
   directive and for the groups-db option in svnserve.conf.
   Justification:
     Configuration knobs should be documented.
   Votes:
     +1: danielsh, rhuijben, kotkov


r1735185 | svn-role | 2016-03-15 23:00:28 -0500 (Tue, 15 Mar 2016)

Merge r1734926 from trunk:

 * r1734926
   Use kde4-config to determine location of headers and libs instead
   of hardcoding them.
   Justification:
     Allows build against KDE4 without conflict with KDE5.
  Votes:
    +1: stsp, rhuijben, danielsh


r1735016 | svn-role | 2016-03-14 23:00:40 -0500 (Mon, 14 Mar 2016)

Merge r1721175 from trunk:

 * r1721175
   hot-backup.py: Input validation.
   Justification:
     Better failure mode on --archive-type=foobar typos.
   Votes:
     +1: danielsh, jamessan, rhuijben


r1735015 | svn-role | 2016-03-14 23:00:35 -0500 (Mon, 14 Mar 2016)

Merge r1721174 from trunk:

 * r1721174
   hot-backup.py: Housekeeping.
   Justification:
     Do the right thing on repository names that contain '+' or '('.
   Votes:
     +1: danielsh, jamessan, rhuijben


r1730783 | svn-role | 2016-02-16 22:00:50 -0600 (Tue, 16 Feb 2016)

Merge the r1729060 group from trunk:

 * r1729060, r1729519
   svn-graph.pl: Canonicalize user-provided URI and hard-coded relpath
   Justification:
     Fixes a non-canonical assertion for a hard-coded path and canonicalizes
     user input to avoid a similar assertion
   Votes:
     +1: jamessan, danielsh, rhuijben


r1730782 | svn-role | 2016-02-16 22:00:46 -0600 (Tue, 16 Feb 2016)

Merge r1728387 from trunk:

 * r1728387
   Fix issue 4611, gpg-agent and passwords with a percent character.
   Justification:
     Some passwords don't work.
   Votes:
     +1: philip, jamessan, rhuijben


r1730781 | svn-role | 2016-02-16 22:00:40 -0600 (Tue, 16 Feb 2016)

Merge r1728308 from trunk:

 * r1728308
   Pass on correct parameter in deprecated function.
   Justification:
     Correct behaviour for deprecated API.
   Votes:
     +1: philip, jamessan, rhuijben


r1726465 | svn-role | 2016-01-23 22:00:24 -0600 (Sat, 23 Jan 2016)

Merge the r1722860 group from trunk:

 * r1722860, r1722861, r1722879, r1722887
   Memory access portability issues.
   Justification:
     Not complying to the C standard is bad.  At the very least we
     improve the signal/noise ratio when using memory sanitizers.
     Part of this patch set (r1722879) fixes a crash on SPARC that
     apparently gets masked by some lucky caller pattern.
     Finally, these changes make the code actually simpler.
   Notes:
     r1722860 fixes the issue originally reported on dev@.
     r1722879 fixes a follow-up issue found by the SPARC buildbot.
     r1722887 removes similar logic from the membuffer cache although
              that had not been reported a faulty. 
     r1722861 has been included to make r1722879 merge cleanly.
   Votes:
     +1: stefan2, rhuijben, jamessan


r1724150 | svn-role | 2016-01-11 22:00:23 -0600 (Mon, 11 Jan 2016)

Merge r1710167 from trunk:

 * r1710167
   Set journal-mode in exclusive-locking mode to improve NFS performance.
   Justification:
     Reduces performance regression compared to 1.8.
   Votes:
     +1: philip, stefan2, julianfoad


r1723822 | svn-role | 2016-01-08 22:00:13 -0600 (Fri, 08 Jan 2016)

Merge r1668625 from trunk:

 * r1668625
   Fix 'svn diff --summarize --ignore-properties'.
   Justification:
     --ignore-properties option should not be ignored in summarize diff mode.
   Notes:
     Doesn't change APIs. Just 'svn'.
   Votes:
     +1: stsp, rhuijben, julianfoad


r1721871 | svn-role | 2015-12-27 22:00:18 -0600 (Sun, 27 Dec 2015)

Merge r1720643 from trunk:

 * r1720643
   Ignore absent nodes during javahl version of svn status -u
   Justification:
     Avoids hard to catch exception in user scenarios. User reported.
   Votes:
     +1: rhuijben, brane


r1719626 | svn-role | 2015-12-11 22:00:43 -0600 (Fri, 11 Dec 2015)

Merge the r1703470 group from trunk:

 * r1703470, r1703475, r1703476, r1703477, r1703544
   Updated INSTALL documentation.
   Justification:
     Corrects outdated and partially incorrect statements
   Votes:
     +1: luke1410, rhuijben


r1719008 | svn-role | 2015-12-09 22:00:15 -0600 (Wed, 09 Dec 2015)

Merge r1714790 from trunk:

 * r1714790
   Fix ruby test suite to work with test-unit gem.
   Justification:
     Ruby test suite would simply not run on Ubuntu 15.10.
     The patch is limited to rb test suite code only.
   Votes:
     +1: stefan2, philip


r1717705 | svn-role | 2015-12-02 22:00:25 -0600 (Wed, 02 Dec 2015)

Merge the r1703688 group from trunk:

 * r1703688, 1703689
   Fix merging deletes of svn:eol-style CRLF or CR files
   Justification:
     Resolves unnecessary tree conflicts.
     Any more reasons needed? :-)
   Votes:
     +1: rhuijben, ivan, philip


r1717703 | svn-role | 2015-12-02 22:00:15 -0600 (Wed, 02 Dec 2015)

Merge r1687812 from trunk:

 * r1687812
   mod_dav_svn: Use LimitXMLRequestBody httpd directive to control maximum
   length of skel-encoded request bodies.
   Justification:
     Allow administrators to setup configurable limits on the size of
     skel-encoded requests.
   Votes:
     +1: ivan, rhuijben, kotkov


r1716563 | svn-role | 2015-11-25 22:00:37 -0600 (Wed, 25 Nov 2015)

Merge r1715793 from trunk:

 * r1715793
   Do not read TXN props on every svn_fs_txn_open() call in libsvn_fs_fs: FSFS
   doesn't use transaction_t.proplist (and never used). This code seems to
   inherited from BDB.
   Justification:
     It's not regression, but it's obvious removal of dead code that is
     responsible for about 5% of I/O operations when running testsuite over
     http:// protocol on Windows, because mod_dav_svn opens TXN for every
     request on transaction.
   Votes:
     +1: ivan, rhuijben, stefan2


r1716562 | svn-role | 2015-11-25 22:00:32 -0600 (Wed, 25 Nov 2015)

Remove the '1.9.x-r1706428' branch, merged in r1716561.

r1716561 | svn-role | 2015-11-25 22:00:16 -0600 (Wed, 25 Nov 2015)

Merge the 1.9.x-r1706428 branch:

 * r1706428, r1706437, r1709388, r1711250, r1711507, r1711510
   Fix issue #4598, "No-op changes no longer dumped by 'svnadmin dump' in 1.9"
   Justification:
     Possible loss of information, different dumps produced by svnadmin and
     svnrdump.  Repository dumps can be used for backup purposes.  Regression
     from 1.8.
   Notes:
     Whole discussion is in http://svn.haxx.se/dev/archive-2015-09/0269.shtml
     (Subject: "No-op changes no longer dumped by 'svnadmin dump' in 1.9").
     .
     r1706428, r1706437 add a regression test.  r1709388, r1711507 fix the
     issue.  r1711250, r1711510 update documentation.  Backport branch is
     required due to conflict in /subversion/tests/cmdline/svnadmin_tests.py
   Branch:
     ^/subversion/branches/1.9.x-r1706428
   Votes:
     +1: kotkov, ivan, stefan2


r1716019 | svn-role | 2015-11-23 22:00:38 -0600 (Mon, 23 Nov 2015)

Merge r1687812 from trunk:

 * r1687812
   mod_dav_svn: Use LimitXMLRequestBody httpd directive to control maximum
   length of skel-encoded request bodies.
   Justification:
     Allow administrators to setup configurable limits on the size of
     skel-encoded requests.
   Votes:
     +1: ivan, gstein, rhuijben


r1716018 | svn-role | 2015-11-23 22:00:34 -0600 (Mon, 23 Nov 2015)

Merge r1714314 from trunk:

 * r1714314
   Don't ignore some of the parameters to svn_ra_svn_create_conn3.
   Justification:
     This is a regresssion against 1.8 but the fix is trivial.
   Votes:
     +1: stefan2, gstein, rhuijben


r1716017 | svn-role | 2015-11-23 22:00:28 -0600 (Mon, 23 Nov 2015)

Merge the r1715224 group from trunk:

 * r1715224, r1715232, r1715262
   ra_serf: Fix setting Content-Type header in 3 outgoing xml requests
   Justification:
     We should properly implement our wire protocol.
   Votes:
     +1: rhuijben, gstein, ivan


r1716016 | svn-role | 2015-11-23 22:00:22 -0600 (Mon, 23 Nov 2015)

Merge r1714358 from trunk:

 * r1714358
   Fix overflow detection in svn_stringbuf_remove and svn_stringbuf_replace.
   Justification:
     Using the public API as documented may result in undefined behavior.
   Votes:
     +1: stefan2, gstein, ivan


r1715319 | svn-role | 2015-11-19 22:00:16 -0600 (Thu, 19 Nov 2015)

Merge r1704847 from trunk:

 * r1704847
   Report both built- and run-time versions of libserf, like we do for
   everything else.
   Justification:
     Easier debugging. Consistency with version-reporting of other runtime
     dependencies.
   Votes:
     +1: danielsh, stefan2, gstein


r1714402 | svn-role | 2015-11-14 22:00:13 -0600 (Sat, 14 Nov 2015)

Merge r1711346 from trunk:

 * r1711346
   Properly remove tempfiles in svnlook on diff errors such as EPIPE.
   Justification:
     Simple fix makes it far less likely that tempfiles are left behind
     on the server.
   Votes:
     +1: rhuijben, stefan2, ivan


r1713077 | svn-role | 2015-11-06 22:00:53 -0600 (Fri, 06 Nov 2015)

Merge r1709553 from trunk:

 * r1709553
   Fix display of process ID in mod_dav_svn cache statistics.
   Justification:
     User cannot determine to which process the output applies.
   Notes:
     rhuijben: The added include is the actual fix. The rest of the patch
               just avoids compile time problems.
   Votes:
     +1: philip, rhuijben, stefan2


r1713076 | svn-role | 2015-11-06 22:00:50 -0600 (Fri, 06 Nov 2015)

Merge r1708699 from trunk:

 * r1708699
   Fix authz with mandatory authn provided by mod_auth_kerb/mod_auth_ntlm.
   Justification:
     Regression introduced in 1.9.2.
   Votes:
     +1: philip, rhuijben, stefan2


r1713075 | svn-role | 2015-11-06 22:00:46 -0600 (Fri, 06 Nov 2015)

Merge the r1706983 group from trunk:

 * r1706983, r1706999
   Add some @since information to config defines
   Justification:
     Trivial correctness fix. Will propagate to documentation.
   Votes:
     +1: rhuijben, ivan, stefan2


r1713074 | svn-role | 2015-11-06 22:00:42 -0600 (Fri, 06 Nov 2015)

Merge r1706783 from trunk:

 * r1706783
   Really pass patch result to svn_client_patch() filter 
   Justification:
     Without this fix the filter can't determine the result of a patch.
   Votes:
     +1: rhuijben, ivan, stefan2


r1713073 | svn-role | 2015-11-06 22:00:37 -0600 (Fri, 06 Nov 2015)

Remove the '1.9.x-r1703581' branch, merged in r1713072.

r1713072 | svn-role | 2015-11-06 22:00:22 -0600 (Fri, 06 Nov 2015)

Merge the 1.9.x-r1703581 branch:

 * r1703581
   Allow simple resolving of binary file text conflicts
   Justification:
     Simple usability improvement. Use reported. Regression.
   Branch:
     ^/subversion/branches/1.9.x-r1703581
   Votes:
     +1: rhuijben, philip, stefan2


r1710936 | svn-role | 2015-10-27 23:00:25 -0500 (Tue, 27 Oct 2015)

Merge the r1710215 group from trunk:

 * r1710215, r1710290
   Make JavaHL SVNClient.vacuum allow non-absolute, and non-canonical, paths.
   Justification:
     Passing the wrong sort of path triggers an assert and kills the JVM.
   Votes:
     +1: philip, rhuijben


r1710935 | svn-role | 2015-10-27 23:00:18 -0500 (Tue, 27 Oct 2015)

Merge the r1705843 group from trunk:

 * r1705843, r1710558
   Cleanup external registrations when they are user deleted
   Justification:
     When a directory external is gone remove its registration. Avoids
     working copies with broken state.
   Votes:
     +1: rhuijben, ivan, philip


r1710721 | svn-role | 2015-10-26 23:00:21 -0500 (Mon, 26 Oct 2015)

Merge the r1701598 group from trunk:

 * r1701598, r1701603, r1701611, r1701646
   Make 'svn lock' and 'svn unlock' report (un)lock errors as failure
   Justification:
     A single lock or unlock failure doesn't affect the whole operation
     since 1.9, but this has the side effect of no longer producing an
     error at all on failures. This patch makes 'svn' return an error when
     at least one failure is reported by the locking code.
   Notes:
     r1701598 is the actual fix. The other patches simplify and fix
     test expectations.
   Votes:
     +1: rhuijben, philip, ivan


r1710720 | svn-role | 2015-10-26 23:00:15 -0500 (Mon, 26 Oct 2015)

Merge the r1706323 group from trunk:

 * r1706323, r1706324
   Fix a crash in libsvn_ra_serf's multistatus parser caused by dereferencing
   a null pointer.
   Justification:
     Segfault. User reported.
   Notes:
     Can be reproduced by trying to do a -g reverse blame against 1.8 server:
     svn blame -g -r 1706092:1706091 https://svn.apache.org/repos/asf/subversion/trunk/README
     .
     r1706323 lays groundwork for the fix by removing unneeded code.
     r1706324 fixes the crash.
   Votes:
     +1: kotkov, philip, ivan


r1710471 | svn-role | 2015-10-25 13:20:24 -0500 (Sun, 25 Oct 2015)

Merge the r1709389 group from trunk:

 * r1709389, r1709562
   Simple translation fix
   Justification:
     Trivial fix that doesn't require nomination, but I like to see
     at least one developer or translator reviewing this.
   Votes:
     +1: rhuijben, philip


r1710470 | svn-role | 2015-10-25 13:20:15 -0500 (Sun, 25 Oct 2015)

Merge the r1705060 group from trunk:

 * r1705060, r1705062, r1705064, r1705088
   Resolve segfault in 'svn diff' when repository is on server root.
   Justification:
     Segfault. User reported. Regression from 1.8.x.
   Notes:
     r1705064 is the actual fix, other revisions are refactoring to
     reuse common code. There are other suspicious usage of apr_uri_parse()
     in ra_serf, but I'm going to resolve them separately.
   Votes:
     +1: ivan, rhuijben, philip


r1710469 | svn-role | 2015-10-25 13:20:08 -0500 (Sun, 25 Oct 2015)

Merge r1706241 from trunk:

 * r1706241
   Resolve unneeded memory growth during pristine cleanup
   Justification:
     Simple iterpool reduces memory usage on applying deletes.
   Votes:
     +1: rhuijben, kotkov, philip


r1710305 | svn-role | 2015-10-23 23:00:40 -0500 (Fri, 23 Oct 2015)

Merge r1710104 from trunk:

 * r1710104
   Fix JavaHL ABI incompatibilty with 1.8.
   Justification:
     Regression from 1.8, JVM SEGV.
   Votes:
     +1: philip, brane


r1706343 | svn-role | 2015-10-01 23:00:22 -0500 (Thu, 01 Oct 2015)

Merge r1705328 from trunk:

 * r1705328
   Resolve a possible segfault in authentication credentials cache caused by
   storing key in APR hashtable without copying to long-life pool. I don't know
   exact reproduction script, but it's obvious bug and crash reported via
   TortoiseSVN crash dump service multiple times.
   Justification:
     Segfault. User reported.
   Votes:
     +1: ivan, rhuijben, kotkov


r1703738 | svn-role | 2015-09-17 23:00:13 -0500 (Thu, 17 Sep 2015)

Merge r1703675 from trunk:

 * r1703675
   Fix formatting of upgrade notification messages.
   Justification:
     Multiple notifications on one line are hard to read.
   Votes:
     +1: philip, stefan2, rhuijben


r1703329 | svn-role | 2015-09-15 23:00:31 -0500 (Tue, 15 Sep 2015)

Merge the r1702533 group from trunk:

 * r1702533, r1702891
   Expose utf8proc version information via 'svn --version --verbose'
   Justification:
     There is no way to retrieve this from the binaries.
   Votes:
     +1: ivan, rhuijben, stefan2


r1703328 | svn-role | 2015-09-15 23:00:28 -0500 (Tue, 15 Sep 2015)

Merge the r1702974 group from trunk:

 * r1702974, r1702991
   Improve error reporting on certain specific database corruptions.
   Justification:
     BH: Although I really don't like adding code for these insane corner
     cases that should not be triggerable without memory or disk corruptions
     the number of exception reports from TortoiseSVN (Thousands!) requests
     some action to help investigating.
     I'm surprised that we didn't get a single report from any of our other
     clients though.
   Votes:
     +1: ivan, rhuijben, kotkov


r1703327 | svn-role | 2015-09-15 23:00:23 -0500 (Tue, 15 Sep 2015)

Merge the r1698312 group from trunk:

 * r1698312, r1702310
   Correctly report empty representations in 'svnfsfs stats'.
   Justification:
     The current code displays the "0" bracket in histograms as
     "-2147483648 .. < 1" instead of "0 .. < 1".  Technically correct
     but annoying.  UI change only.
   Votes:
     +1: rhuijben, stefan2, ivan


r1703092 | svn-role | 2015-09-14 23:00:28 -0500 (Mon, 14 Sep 2015)

Merge the r1702237 group from trunk:

 * r1702237, r1702238, r1702239
   Resolve using uninitialized conflict when non-recursive reverting move
   Justification:
     Segfault. User reported.
   Votes:
     +1: rhuijben, ivan, stefan2


r1703091 | svn-role | 2015-09-14 23:00:25 -0500 (Mon, 14 Sep 2015)

Merge the r1702218 group from trunk:

 * r1702218, r1702474, r1702478
   Fix segfault in 'svn upgrade' of pre-Subversion 1.3 working copies with
   externals.
   Justification:
     Segfault. User reported.
   Notes:
     r1702218 fixes the problem.
     r1702474 and r1702478 adds a testcase.
   Votes:
     +1: ivan, rhuijben, stefan2


r1703090 | svn-role | 2015-09-14 23:00:22 -0500 (Mon, 14 Sep 2015)

Merge r1702247 from trunk:

 * r1702247
   Resolve segfault incoming delete of tree containing switched paths
   Justification:
     Segfault. User reported.
   Votes:
     +1: rhuijben, ivan, stefan2


r1703089 | svn-role | 2015-09-14 23:00:19 -0500 (Mon, 14 Sep 2015)

Merge r1701997 from trunk:

 * r1701997
   Fix crash due access to uninitialized pointer.
   Justification:
     Access to uninitialized pointer is some unknown conditions. Reported
     multiple times using TortoiseSVN crash reporter tool.
   Votes:
     +1: ivan, rhuijben, stefan2


r1703088 | svn-role | 2015-09-14 23:00:16 -0500 (Mon, 14 Sep 2015)

Merge r1701638 from trunk:

 * r1701638
   Remove unneeded io operation on pristine install
   Justification:
     Every IO operation counts in checkout performance. Doing something
     that is never necessary just slows things down. (The rename handling
     would handle read-only just fine... And matching SHA-1 is handled at
     a higher level)
   Votes:
     +1: rhuijben, ivan, stefan2


r1702848 | svn-role | 2015-09-13 23:00:30 -0500 (Sun, 13 Sep 2015)

Merge the r1701838 group from trunk:

 * r1701838, r1702203
   Fix attempt to use uninitialized svn_wc__db_install_data_t pointer on
   error in working copy update editor. Reproduction script:
   $ svn co URL wc --depth=empty
   $ rm -rf wc/.svn/tmp
   $ svn up wc --set-depth=infinity
   Justification:
     Crash. Reported multiple times using TortoiseSVN crash reporter tool.
   Depends:
     Depends on the r1702198, r1702200 backport due conflicts in
     update_tests.py.
   Votes:
     +1: rhuijben, ivan, kotkov


r1702847 | svn-role | 2015-09-13 23:00:26 -0500 (Sun, 13 Sep 2015)

Merge the r1678755 group from trunk:

 * r1678755, r1679240, r1702467, r1702472, r1702549, r1702553
   Unbreak propset followed by put on the same svnmucc target
   Justification:
     Assuming that the target exists, this should just work without
     an error... It produced an error.
   Notes:
     r1678755, r1679240 - Adds some regression tests that would cause
                          conflicts
     r1702467 - fixes the real bug.
     r1702472 - fixes a few error message texts
     r1702549, r1702553 - adds regression tests
   Votes:
     +1: rhuijben, kotkov, ivan


r1702696 | svn-role | 2015-09-12 23:00:29 -0500 (Sat, 12 Sep 2015)

Merge the r1702299 group from trunk:

 * r1702299, r1702300, r1702397, r1702407, r1702565
   Handle merging to local add as error instead of segfault.
   Justification:
     Segfault. User reported.
   Notes:
     r1702299 adds a testcase.
     r1702397 fixes the problem with automatic merge and updates the test.
     r1702565 fixes a quite similar segfault with --reintegrate merge.
     The other revisions are minor cleanup.
   Votes:
     +1: kotkov, julianfoad, rhuijben
     +1: ivan (without r1702565)


r1702590 | svn-role | 2015-09-11 23:00:31 -0500 (Fri, 11 Sep 2015)

Merge r1702288 from trunk:

 * r1702288
   Return error if get unexpected 'X-SVN-VR-Base' HTTP header value instead of
   crashing.
   Justification:
     Segfault. User reported.
   Votes:
     +1: ivan, rhuijben, kotkov


r1702589 | svn-role | 2015-09-11 23:00:28 -0500 (Fri, 11 Sep 2015)

Merge r1702231 from trunk:

 * r1702231
   Fix potential access to uninitialized memory during 'svn commit'.
   I don't know exact reproduction script, but it's obvious bug and
   crash reported via TortoiseSVN crash dump service multiple times.
   Justification:
     Segfault. User reported.
   Votes:
     +1: ivan, rhuijben, kotkov


r1702588 | svn-role | 2015-09-11 23:00:25 -0500 (Fri, 11 Sep 2015)

Merge the r1702198 group from trunk:

 * r1702198, r1702200
   Resolve segfault while updating already conflicted tree
   Justification:
     Segfault. User reported.
   Votes:
     +1: rhuijben, ivan, kotkov


r1702370 | svn-role | 2015-09-10 23:00:13 -0500 (Thu, 10 Sep 2015)

Merge the r1701064 group from trunk:

 * r1701064, r1701206, r1701298, r1701736
   Fix Access Denied errors on checkout/update with working copies stored on
   SMBv1 network shares [1], [2]. This also should fix potential spurious
   'access denied' errors with local working copies and background
   indexers/antiviruses.
   [1] http://svn.haxx.se/dev/archive-2015-09/0054.shtml
   [2] http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3134203
   Justification:
     Regression from Subversion 1.8.x.
   Notes:
     The r1701298, r1701736 patches are the fix (re-introduce a retry loop to
     handle cases where the target of the replacement is still open by another
     application and handle access denied for SMBv1), r1701064 and r1701206
     are just formatting fixes and cleanups.
   Votes:
     +1: rhuijben, ivan, kotkov


r1701900 | svn-role | 2015-09-08 23:00:25 -0500 (Tue, 08 Sep 2015)

Merge the r1701633 group from trunk:

 * r1701633, r1701792, r1701797
   Disable mark, seek and non-default skip for stdin, stdout and stderr
   stream wrappers
   Justification:
     Reduce surprises on using these apis.
   Notes:
     The r1701633 patch disables mark and seek for these streams;
     r1701792 and r1701797 disable native svn_stream_skip() handler.
   Votes:
     +1: kotkov, ivan, rhuijben


r1701723 | svn-role | 2015-09-07 23:00:14 -0500 (Mon, 07 Sep 2015)

Merge r1701237 from trunk:

 * r1701237
   Fix compilation with apr 1.2.x
   Justification:
     Compatibility was broken by r1692801.
   Votes:
     +1: rhuijben, brane, stefan2


r1701722 | svn-role | 2015-09-07 23:00:11 -0500 (Mon, 07 Sep 2015)

Merge the r1687304 group from trunk:

 * r1687304,1687389,1693135,1693138,1693159,1695600,1695606,1695681
   Better configure detection of httpd version and auth fix.
   Justification:
     Build out-of-the box on more platforms.
   Votes:
     +1: philip, brane, stefan2


r1701440 | svn-role | 2015-09-05 23:00:12 -0500 (Sat, 05 Sep 2015)

Merge the r1700740 group from trunk:

 * r1700740, r1700951
   Fix registration of kwallet to avoid double free on close
   Justification:
     Fixes segfault on kwallet close. User reported problem.
   Votes:
     +1: rhuijben, stsp, brane


r1701439 | svn-role | 2015-09-05 23:00:08 -0500 (Sat, 05 Sep 2015)

Merge the r1666965 group from trunk:

 * r1666965, r1667120
   Reduce 'the lag' of the first svn log results over mod_dav.
   Justification:
     A slow svn log makes users call Subversion slow. This fixes the
     perceived performance problem by no longer optimizing just for
     obtaining all the results fast, but also for obtaining the first
     result fast.
     .
     Just the perceived slowness of common svn log operations might
     make users switch to a DVCS or implement a client side cache,
     while this slowness is just a buffering to make the total set of
     results come in faster. But I don't think there are that many users
     that really wait for all results of
     .
     $ svn log -q ^/subversion/trunk
     .
     This currently takes > 10 seconds before the first result using
     the EU mirror for me. With --limit 1 (best comparison with post-patch)
     that would be 0.2 seconds.
   Votes:
     +1: rhuijben, philip, brane
     -0.5: ivan (It's not security or bug fix. The change itself a little
                 bit controversial for me, so it's better to release it as
                 part of Subversion 1.9.0)


r1701346 | svn-role | 2015-09-04 23:00:41 -0500 (Fri, 04 Sep 2015)

Remove the '1.8.x-memory-fragmentation' branch, merged in r1701345.

r1701345 | svn-role | 2015-09-04 23:00:25 -0500 (Fri, 04 Sep 2015)

Merge the 1.8.x-memory-fragmentation branch:

 * ^/subversion/branches/1.8.x-memory-fragmentation
   Reduce FSFS memory allocation in Apache with unbounded MaxFreeMem.
   Justification:
     A user reported that their worker processes ran OOM with Apache 2.2
     in default configuration when fulltext caching was enabled. Although
     people should set MaxFreeMem to something other than 0, we should
     play nice with out-of-the-box setups.
     The patch itself is relatively low-risk (changes initial buffer size).
   Votes:
     +1: stefan2, brane, rhuijben


r1701155 | svn-role | 2015-09-03 23:00:48 -0500 (Thu, 03 Sep 2015)

Remove the '1.8.x-r1618472' branch, merged in r1701154.

r1701154 | svn-role | 2015-09-03 23:00:32 -0500 (Thu, 03 Sep 2015)

Merge the 1.8.x-r1618472 branch:

 * r1618472, r1618841, r1632635, r1640832
   Fix a segfault with old style text delta.
   Justification:
     Compiling with -O3 in GCC 4.9 produces code that segfaults.  The newer
     1.9 / trunk code is simpler and compiles just fine.  Also, that code
     section is no longer performance critical.
   Notes:
     The branch code in text_delta is now the same as 1.9 / trunk, except for
     a stream API usage and an unused function.
   Branch:
     ^/subversion/branches/1.8.x-r1618472
   Votes:
     +1: stefan2, brane, rhuijben


r1701153 | svn-role | 2015-09-03 23:00:24 -0500 (Thu, 03 Sep 2015)

Merge r1694929 from trunk:

 * r1694929
   Fix memory corruption in SWIG bindings' svn_client_copy_source_t
   constructor.
   Justification:
     Constructor result is not correct as REVISION gets partially overwritten
     by PEG_REVISION. May also result in segfaults.
   Votes:
     +1: stefan2, philip, rhuijben


r1701152 | svn-role | 2015-09-03 23:00:22 -0500 (Thu, 03 Sep 2015)

Merge r1691928 from trunk:

 * r1691928
   Fix issue #4584, "Non-canonical $HOME crashes GPG-agent support code".
   Justification:
     Regression introduced in 1.8.11. Simple cause; simple fix.
   Notes:
     Also nominated for 1.9.x.
     Trunk has a better fix, but less suitable for backporting, in r1691952.
   Votes:
     +1: julianfoad, philip, brane


r1698057 | svn-role | 2015-08-26 23:00:36 -0500 (Wed, 26 Aug 2015)

Merge r1697845 from trunk:

 * r1697845
   Fix compiler warning about empty while statement body.
   Justification:
     Whilst we don't usually backport compiler warning fixes, this one
     is caused by a bug in a macro definition, which this backport fixes.
   Votes:
     +1: brane, rhuijben, stefan2


r1698056 | svn-role | 2015-08-26 23:00:34 -0500 (Wed, 26 Aug 2015)

Merge r1697835 from trunk:

 * r1697835
   Fix compiler warning about const/non-const pointer conversion.
   Justification:
     Whilst we don't usually backport compiler warning fixes, this one
     is fallout from the r1696222 group backport.
   Votes:
     +1: brane, rhuijben, stefan2


r1698055 | svn-role | 2015-08-26 23:00:31 -0500 (Wed, 26 Aug 2015)

Merge the r1694481 group from trunk:

 * r1694481, r1697824
   Fix Unix build on systems without GPG agent.
   Justification:
     This is a user-reported issue.
   Votes:
     +1: brane, stefan2, rhuijben
     +1: philip (without r1697824)


r1698054 | svn-role | 2015-08-26 23:00:27 -0500 (Wed, 26 Aug 2015)

Merge r1694194 from trunk:

 * r1694194
   Correct a parameter name in svn_repos_get_fs_build_parser5.
   Justification:
     The docstring shall match the actual declaration.
   Note:
     This is not an API change as it does not affect any user of that
     function nor does it break binary compatibility.  To keep the code
     churn low, the implementation has not been updated - it happens to
     use "parser" as the name of a local variable.
   Votes:
     +1: stefan2, brane, rhuijben


r1698053 | svn-role | 2015-08-26 23:00:25 -0500 (Wed, 26 Aug 2015)

Merge r1695022 from trunk:

 * r1695022
   Fix incomplete membuffer cache initialization.
   Justification:
     Most users won't be hit by this because the OS hands out nicely zeroed
     memory pages which we won't recycle until the end of the process. So,
     this problem primarily hits people running a setup that deliberately
     poisons memory upon allocation (APR pool debugging, MSVC debug malloc).
     However, those who use very small caches and initialize them late in
     the application's lifetime, might get recycled / "dirty" memory blocks
     as well ending up with segfaults etc.
   Votes:
     +1: stefan2, brane, rhuijben


r1698052 | svn-role | 2015-08-26 23:00:23 -0500 (Wed, 26 Aug 2015)

Merge the r1687304 group from trunk:

 * r1687304,1687389,1693135,1693138,1693159,1695600,1695606,1695681
   Better configure detection of httpd version and auth fix.
   Justification:
     Build out-of-the box on more platforms.
   Votes:
     +1: philip, stefan2, brane


r1697816 | svn-role | 2015-08-25 23:00:23 -0500 (Tue, 25 Aug 2015)

Merge the r1696387 group from trunk:

 * r1696387, r1697664
   Expose expat and zlib versions in svn --version --verbose
   Justification:
     Without a patch these numbers aren't visible in Windows distributions,
     which usually link these dependencies statically.
   Votes:
     +1: brane, rhuijben, stefan2


r1697815 | svn-role | 2015-08-25 23:00:21 -0500 (Tue, 25 Aug 2015)

Merge r1696695 from trunk:

 * r1696695
   Resolve circular library reference in libsvn_fs_x
   Justification:
     Causes library load failures on at least some Linux setups.
     [The only reason it doesn't fail on Windows is that we currently link
      libsvn_fs* into a single .dll]
   Votes:
     +1: rhuijben, stefan2, brane


r1697814 | svn-role | 2015-08-25 23:00:19 -0500 (Tue, 25 Aug 2015)

Merge r1693886 from trunk:

 * r1693886
   Fix an error leak in FSFS verification.
   Justification:
     Don't have memory leaks.
   Votes:
     +1: stefan2, philip, brane


r1697541 | svn-role | 2015-08-24 23:00:30 -0500 (Mon, 24 Aug 2015)

Merge r1694929 from trunk:

 * r1694929
   Fix memory corruption in SWIG bindings' svn_client_copy_source_t
   constructor.
   Justification:
     Constructor result is not correct as REVISION gets partially overwritten
     by PEG_REVISION. May also result in segfaults.
   Votes:
     +1: stefan2, philip
     +0.5: rhuijben (Minimal review)


r1697540 | svn-role | 2015-08-24 23:00:28 -0500 (Mon, 24 Aug 2015)

Merge the r1696222 group from trunk:

 * r1696222, r1696225
   Implement polling on named pipes on Windows to resolve svn+ssh:// problems
   Justification:
     Without this patch operations like checkout just fail with an error.
     This is a regression as older Subversion releases ignored the error.
   Votes:
     +1: rhuijben, brane, stefan2


r1697539 | svn-role | 2015-08-24 23:00:25 -0500 (Mon, 24 Aug 2015)

Merge r1691928 from trunk:

 * r1691928
   Fix issue #4584, "Non-canonical $HOME crashes GPG-agent support code".
   Justification:
     Regression introduced in 1.8.11. Simple cause; simple fix.
   Notes:
     Also nominated for 1.8.x.
     Trunk has a better fix, but less suitable for backporting, in r1691952.
   Votes:
     +1: julianfoad, philip, stefan2
     +1: danielsh (either with or without r1691952; haven't tried to reproduce,
                   only reviewed the diff)
     +0: rhuijben (Can't test this part. +1 on the combination with r1691952.
                   I don't see returning a properly canonicalized path
                   instead of a potentially non canonical path as a breaking
                   change that can't be backported. I would call it a bugfix
                   that should be backported)


r1697538 | svn-role | 2015-08-24 23:00:23 -0500 (Mon, 24 Aug 2015)

Merge the r1674626 group from trunk:

 * r1674626, r1674785
   On Windows: Enable memcached support in libsvn_subr on apr-util 1.3+
   Justification:
     Apr-Util 1.3+ always provides memcached client support, so we can just
     support this on Windows with a trivial buildsystem change. This makes the
     behaviour similar to that on other platforms.
   Votes:
     +1: rhuijben, ivan, stefan2
     +0.9: brane (The change looks trivially correct, but I can't test it)


r1694136 | svn-role | 2015-08-04 23:00:18 -0500 (Tue, 04 Aug 2015)

Merge r1694023 from trunk:

 * r1694023
   Fix typo in help string.
   Justification:
     Obvious fix.
   Votes:
     +1: danielsh


r1689313 | svn-role | 2015-07-05 23:00:37 -0500 (Sun, 05 Jul 2015)

Merge the r1686175 group from trunk:

 * r1686175, r1687029, r1688258
   Fix part of issue #4582, "reintegrate complains about missing ranges
   from node unrelated to branch"
   Justification:
     Reintegrate merge is impossible after the default conflict resolution
     option is applied to a particular tree conflict during a sync merge.
   Votes:
     +1: stsp, philip, brane


r1688548 | svn-role | 2015-06-30 23:00:31 -0500 (Tue, 30 Jun 2015)

Merge the r1688273 group from trunk:

 * r1688273, r1688395
   Implement the new semantics of the changed svn_repos_verify_fs3 in JavaHL.
   Justification:
     This is a follow-up to the changed in the r1684940 group which is
     already approved for backport, and a bindings API change that
     can't be backported after 1.9.0.
   Depends:
     Depends on the r1684940, r1685034, r1687769, r1687776 backport.
   Notes:
     r1688273 implements the API semantics; r1688395 contains
     minor spelling and documentation fixes.
     .
     Clean merge depends on merging the r1684940 group first.
   Votes:
     +1: brane, rhuijben


r1688547 | svn-role | 2015-06-30 23:00:26 -0500 (Tue, 30 Jun 2015)

Merge the r1684940 group from trunk:

 * r1684940, r1685034, r1687769, r1687776
   Make 'svnadmin verify --keep-going --quiet' print error details to stderr,
   as documented by 'svnadmin help verify'.
   Justification:
     Calling a command with --quiet should not hide important parts of the
     output, such as verification errors.  Without this fix, 'svnadmin verify
     --keep-going --quiet' is rather useless in terms that it only gives an
     indication of whether a particular repository passes the verification or
     not, but doesn't show the root cause (error details) of what's wrong.
   Notes:
     This change features a redesign of the error reporting scheme being used
     by svn_repos_verify_fs3() API.  At some point we realized that the way
     API was working previously forced us to write rather hacky code on the
     calling side in order to achieve the wanted behavior.  With the API
     redesign, this is no longer needed.  Full discussion can be found in
     http://svn.haxx.se/dev/archive-2015-05/0141.shtml (Subject: "Possible
     incompatibility of svn_repos_verify_fs2() in 1.9.0-rc1").
     .
     r1684940 and r1685034 contain the initial fix for this problem and the
     test.  r1687769 is the core fix that changes svn_repos_verify_fs3() API
     and supersedes the fix from r1684940.  r1687776 is a documentation-only
     follow-up to r1687769.  This is a 1.9.0 blocker due to a change in the
     unreleased API.
   Votes:
     +1: kotkov, rhuijben, brane


r1687168 | svn-role | 2015-06-23 23:03:27 -0500 (Tue, 23 Jun 2015)

Merge the r1686554 group from trunk:

 * r1686554, r1686557, r1686239, r1686541, r1686543, r1686802
   Fix 'svnadmin hotcopy' for read-only FSFS repositories
   Justification:
     Format 7 repositories could not be hotcopied without write access to
     the source repo - which is a regression vs. older formats.  Because
     the new test case also uncovered another regression with hotcopying
     the rep-cache.db from r/o repos.
   Notes:
     The first two revisions contain the actual fix, the others provide a
     test case.  Since the total lines changed is small, the most efficient
     way to review is to via the combined diff.
   Votes:
     +1: stefan2, brane, rhuijben, kotkov


r1687167 | svn-role | 2015-06-23 23:03:24 -0500 (Tue, 23 Jun 2015)

Merge the r1682714 group from trunk:

 * r1682714, r1682854, r1683126, r1683135, r1683290
   Fix segfaults in FSX's directory processing code.
   Justification:
     Despite its experimental state, FSX shall not segfault the server.
   Notes:
     The last 3 patches combine to a 1-liner and are included verbatim
     to prevent conflicts.  Since the total lines changed is small, the
     most efficient way to review is to do it via the combined diff.
   Votes:
     +1: stefan2, brane, rhuijben


r1687166 | svn-role | 2015-06-23 23:03:21 -0500 (Tue, 23 Jun 2015)

Merge the r1686478 group from trunk:

 * r1686478, r1686888, r1686984
   Make 'blame -g' work with old clients against new servers.
   Justification:
     Without this patch, old clients will "lose track" of what changes
     happened in -g mode and produce wrong / worse blames than against
     old servers.
     The output of 'blame -g' is only an approximation.  However, the
     new server would cause much worse results in old clients especially
     in simple cases where lines of development are kept in close sync.
   Votes:
     +1: stefan2 (without r1686984)
     +1: brane, philip, rhuijben


r1687165 | svn-role | 2015-06-23 23:03:20 -0500 (Tue, 23 Jun 2015)

Merge r1685085 from trunk:

 * r1685085
   Install svnbench as part of 'make install'.
   Justification:
     svnbench moved from  tools/ to subversion/ so it should be installed
     by default.
   Votes:
     +1: stsp, stefan2, brane


r1687164 | svn-role | 2015-06-23 23:03:16 -0500 (Tue, 23 Jun 2015)

Merge r1674522 from trunk:

 * r1674522
   Skip the 'upgrade_tests.py 36: automatic SQLite ANALYZE' test on old python
   Justification:
     Our testsuite shouldn't fail just because python has an old sqlite
     version compiled in.
   Notes:
     This nomination is partially to just mark this problem as 'known issue'.
     This patch was already accepted for 1.9.x
   Votes:
     +1: rhuijben, stefan2, brane


r1687163 | svn-role | 2015-06-23 23:03:13 -0500 (Tue, 23 Jun 2015)

Remove the '1.8.x-r1667228' branch, merged in r1687162.

r1687162 | svn-role | 2015-06-23 23:02:58 -0500 (Tue, 23 Jun 2015)

Merge the 1.8.x-r1667228 branch:

 * r1667228, r1667234, r1667691
   Fix conflict description for binary file conflicts.
   Justification:
     Conflict description API violates its own promises.
   Branch:
     ^/subversion/branches/1.8.x-r1667228
   Votes:
     +1: stsp, stefan2, brane


r1687161 | svn-role | 2015-06-23 23:02:45 -0500 (Tue, 23 Jun 2015)

Remove the '1.7.x-r1674455' branch, merged in r1687160.

r1687160 | svn-role | 2015-06-23 23:02:30 -0500 (Tue, 23 Jun 2015)

Merge the 1.7.x-r1674455 branch:

 * ^/subversion/branches/1.7.x-r1674455
   Make 'svn cp ^/A/D/H@1 ^/A' properly create A
   Justification:
     Resurrecting a child as its own ancestor should work, instead of produce
     an error message on a non existing problem.
   Notes:
     Needs backport branch since the test framework changed on trunk
   Votes:
     +1: rhuijben, stefan2, brane


r1687159 | svn-role | 2015-06-23 23:02:16 -0500 (Tue, 23 Jun 2015)

Remove the 'v1.7.x-VS2012-15' branch, merged in r1687158.

r1687158 | svn-role | 2015-06-23 23:02:01 -0500 (Tue, 23 Jun 2015)

Merge the v1.7.x-VS2012-15 branch:

 * ^/subversion/branches/v1.7.x-VS2012-15
   Support building with Visual Studio 2012, 2013 and 2015
   Justification:
     Without this patch building 1.7.x with the last two releases
     of Visual Studio requires manual upgrade steps. This patch does
     the minimal amount of work to handle things automatically.
   Votes:
     +1: rhuijben, stefan2, brane


r1687157 | svn-role | 2015-06-23 23:01:48 -0500 (Tue, 23 Jun 2015)

Remove the '1.7.x-r1561419' branch, merged in r1687156.

r1687156 | svn-role | 2015-06-23 23:01:33 -0500 (Tue, 23 Jun 2015)

Merge the 1.7.x-r1561419 branch:

 * r1561419
   Fix 'svnadmin recover' for pre-1.4 FSFS repositories.
   Justification:
     After recovering a repository committed to by 1.8, future commits may
     otherwise use ambiguous IDs.
   Branch:
     ^/subversion/branches/1.7.x-r1561419
   Votes:
     +1: stefan2, stsp, brane


r1687155 | svn-role | 2015-06-23 23:01:19 -0500 (Tue, 23 Jun 2015)

Remove the '1.7.x-issue4551' branch, merged in r1687154.

r1687154 | svn-role | 2015-06-23 23:01:02 -0500 (Tue, 23 Jun 2015)

Merge the 1.7.x-issue4551 branch:

 * r1652182, r1652195, r1652200, r1653622, r1653623, r1653988, r1654039, r1654162, r1654186, r1654271
   Fix issue #4551 "svnrdump load commits wrong properties, or fails, on a
   non-deltas dumpfile".
   Justification:
     Data loss.
   Branch: ^/subversion/branches/1.7.x-issue4551
   Notes:
     r1653988, r1654039, r1654271 contain the fixes; the rest are adding tests.
   Votes:
     +1: julianfoad, stefan2, brane


r1687153 | svn-role | 2015-06-23 23:00:46 -0500 (Tue, 23 Jun 2015)

Remove the '1.7.x-r1542765' branch, merged in r1687152.

r1687152 | svn-role | 2015-06-23 23:00:31 -0500 (Tue, 23 Jun 2015)

[Reverted in r1692658]

Merge the 1.7.x-r1542765 branch:

 * r1542765, r1571214
   Add Sqlite index information.
   Justification:
     Adding this information explains to Sqlite how we use our indexes. While
     Subversion 1.7 doesn't depend on this as much as 1.8 as we didn't tune the
     queries as much at that time, this information will make several queries
     use indexes instead of table scans.
   Branch:
     ^/subversion/branches/1.7.x-r1542765
   Votes:
     +1: rhuijben, stefan2, brane


r1686967 | svn-role | 2015-06-22 23:00:52 -0500 (Mon, 22 Jun 2015)

Merge r1683378 from trunk:

 * r1683378
   Prevent a possible FSFS repository corruption with power or network disk
   failures during 'svnadmin pack'.
   Justification:
     Repository corruption/data loss.
   Note:
     This is not regression since 1.8.x and change can be released in patch
     release.
   Votes:
     +1: ivan, stefan2, rhuijben


r1686966 | svn-role | 2015-06-22 23:00:50 -0500 (Mon, 22 Jun 2015)

Merge r1683303 from trunk:

 * r1683303
   Resolve a race condition in some test suite cleanup code.
   Justification:
     Without this patch running the testsuite on bdb x svnserve consistently
     fails on at least some Windows test systems. bdb x serf sometimes
     triggers the same problem, but in far less cases.
     .
     This specific test -unlike other tests- cleans up its own environment a
     few times to retry some scenarios on the same paths.
   Votes:
     +1: rhuijben, brane, stefan2


r1686965 | svn-role | 2015-06-22 23:00:46 -0500 (Mon, 22 Jun 2015)

Merge the r1678494 group from trunk:

 * r1678494, r1680495, r1680705
   Document svn:auto-props.
   Justification:
     Documentation should be complete.
   Votes:
     +1: danielsh, rhuijben, stefan2
     +1: stsp (without r1680705)


r1686964 | svn-role | 2015-06-22 23:00:42 -0500 (Mon, 22 Jun 2015)

Remove the '1.8.x-r1674455' branch, merged in r1686963.

r1686963 | svn-role | 2015-06-22 23:00:27 -0500 (Mon, 22 Jun 2015)

Merge the 1.8.x-r1674455 branch:

 * r1674455
   Make 'svn cp ^/A/D/H@1 ^/A' properly create A
   Justification:
     Resurrecting a child as its own ancestor should work, instead of produce
     an error message on a non existing problem.
   Notes:
     Not a regression. Same issue exists in 1.7.x
     Needs backport branch since the test framework changed on trunk
   Branch:
     ^/subversion/branches/1.8.x-r1674455
   Votes:
     +1: rhuijben, stsp, stefan2


r1685030 | svn-role | 2015-06-11 23:00:30 -0500 (Thu, 11 Jun 2015)

Merge the r1684325 group from trunk:

 * r1684325, r1684344
   Fix an unintended doubling of error messages in 'svnadmin verify'
   without the --keep-going flag.
   Justification:
     Fixes a bug that was introduced in r1683311, which was
     already merged to 1.9.x.
   Votes:
     +1: brane, rhuijben, philip


r1685029 | svn-role | 2015-06-11 23:00:24 -0500 (Thu, 11 Jun 2015)

Merge r1658168 from trunk:

 * r1658168
   Properly handle errors when parsing skel encoded HTTP requests in
   mod_dav_svn.
   Justification:
     Without this fix server reports 400 (Bad Request) HTTP status code
     instead of expected 413 (Request Entity Too Large) for large
     skel encoded requests.
   Votes:
     +1: ivan, rhuijben, philip


r1685028 | svn-role | 2015-06-11 23:00:21 -0500 (Thu, 11 Jun 2015)

Merge the r1672295 group from trunk:

 * r1672295, r1673691
   Fix Sqlite 3.8.9 query performance regression on externals
   Justification:
     The regression tests shouldn't fail.
     (And the query performance on working copies with an extreme
      number of externals defined on different paths shouldn't
      regress)
   Votes:
     +1: rhuijben, ivan, philip


r1684810 | svn-role | 2015-06-10 23:00:41 -0500 (Wed, 10 Jun 2015)

Remove the '1.8.x-r1684077' branch, merged in r1684809.

r1684809 | svn-role | 2015-06-10 23:00:25 -0500 (Wed, 10 Jun 2015)

Merge the 1.8.x-r1684077 branch:

 * r1684077
   Detect invalid svndiff data earlier.
   Justification:
     Do not waste memory on invalid user or server input.
   Branch:
     ^/subversion/branches/1.8.x-r1684077
   Votes:
     +1: ivan, kotkov, rhuijben


r1684558 | svn-role | 2015-06-09 23:00:29 -0500 (Tue, 09 Jun 2015)

Merge r1684412 from trunk:

 * r1684412
   Make JavaHL native code compile with a C++11 compiler.
   Justification:
     The upcoming MSVC14, part of Visual Studio 2015,
     supports user-defined literals, which means that
     trying to build JavaHL with VS2015 will fail.
   Note:
     To test this change with gcc/clang on *ix, edit the file
     build/ac-macros/compiler.m4 to replace '-std=c++98' with
     '-std=c++11', then autogen, configure, build and run
     the JavaHL tests.
   Votes:
     +1: brane, rhuijben


r1684557 | svn-role | 2015-06-09 23:00:24 -0500 (Tue, 09 Jun 2015)

Merge r1684077 from trunk:

 * r1684077
   Detect invalid svndiff data earlier.
   Justification:
     Do not waste memory on invalid user or server input.
   Votes:
     +1: ivan, brane, rhuijben


r1684556 | svn-role | 2015-06-09 23:00:23 -0500 (Tue, 09 Jun 2015)

Merge r1684322 from trunk:

 * r1684322
   Fix a minor omission in JavaHL's VersionExtended class:
   the dispose() and finalize() methods were missing.
   Justification:
     Without the dispose() method, the user of the VersionExtended
     class cannot avoid a memory leak in native memory.
   Note:
     VersionExtended is new in 1.9. If we release it without
     the dispose() and finalize() methods, the bug will have to
     persist to 1.10, because adding the methods would be
     a public API change.
   Votes:
     +1: brane, rhuijben


r1684308 | svn-role | 2015-06-08 23:00:27 -0500 (Mon, 08 Jun 2015)

Merge r1684034 from trunk:

 * r1684034
   Fix prop_tests.py#42 test failures with non-US default locale on
   Windows [1].
   Justification:
     Tests should not fail.
   Votes:
     +1: ivan, rhuijben


r1683658 | svn-role | 2015-06-04 23:00:33 -0500 (Thu, 04 Jun 2015)

Merge r1683311 from trunk:

 * r1683311
   Make error reporting from svn_repos_verify_fs3 consistent
   with behaviour of svn_repos_verify_fs2 in 1.8.x.
   Justification:
     Errors from the FS implementation are squashed even in normal
     mode without --keep-going. See: http://s.apache.org/j9Z
   Note: Can't go into 1.9.1+ because of a new/changed error code.
   Votes:
     +1: brane, rhuijben, stefan2


r1683457 | svn-role | 2015-06-03 23:00:13 -0500 (Wed, 03 Jun 2015)

Merge r1683387 from trunk:

 * r1683387
   Fix abort() in svn-status handler on platforms that doesn't support C99
   format specifiers for strftime(): %F and %z are new in C99 and C89
   compiler/runtime doesn't support them.
   Justification:
     Server-side crash in new small feature. Simple fix.
   Votes:
     +1: ivan, brane, rhuijben


r1683217 | svn-role | 2015-06-02 23:00:24 -0500 (Tue, 02 Jun 2015)

Merge r1683071 from trunk:

 * r1683071
   Document the meaning of "XFAIL" for users building from source.
   Justification:
     Answers a FAQ.
   Votes:
     +1: danielsh


r1682361 | svn-role | 2015-05-28 23:00:25 -0500 (Thu, 28 May 2015)

Merge r1681317 from trunk:

 * r1681317
   Clarify 'svn help' output for --show-inherited-properties.
   Justification:
     Avoid circular language in help output.
   Votes:
     +1: danielsh, breser, rhuijben


r1682147 | svn-role | 2015-05-27 23:00:58 -0500 (Wed, 27 May 2015)

Merge the r1680495 group from trunk:

 * r1680495, r1680705
   Extend svn:auto-props documentation further.
   Justification:
     Allows users to use svn:auto-props after reading 'svn help' without
     referring to additional documentation.
   Votes:
     +1: stsp (without r1680705)
     +1: danielsh, rhuijben, breser


r1682146 | svn-role | 2015-05-27 23:00:52 -0500 (Wed, 27 May 2015)

Merge r1680819 from trunk:

 * r1680819
   Prevent a possible FSFS repository corruption with power or network disk
   failures when changing revision properties.
   Notes:
     Not a regression. Same issue exists in 1.7.x and 1.8.x. But it would
     be nice to have in 1.9.0.
   Justification:
     Repository corruptions are bad (user reported this issue privately)
   Votes:
     +1: ivan, kotkov, stefan2


r1682145 | svn-role | 2015-05-27 23:00:47 -0500 (Wed, 27 May 2015)

Remove the '1.8.x-r1680819' branch, merged in r1682144.

r1682144 | svn-role | 2015-05-27 23:00:31 -0500 (Wed, 27 May 2015)

Merge the 1.8.x-r1680819 branch:

 * r1680819
   Prevent a possible FSFS repository corruption with power or network disk
   failures when changing revision properties.
   Notes:
     Not a regression. Same issue exists in 1.7.x.
   Branch:
     ^/subversion/branches/1.8.x-r1680819
   Justification:
     Repository corruptions are bad (user reported this issue privately)
   Votes:
     +1: ivan, kotkov, stefan2


r1680728 | svn-role | 2015-05-20 23:00:19 -0500 (Wed, 20 May 2015)

Merge the r1678950 group from trunk:

 * r1678950, r1678963, r1679864, r1679866
   Ensure full key matching in membuffer cache.
   Justification:
     While the chances of producing an actual key conflict are very slim
     today, they are non-zero.  Due to the central role of the caching
     code, we should not leave that ever so small risk in production for
     the years to come.
   Votes:
     +1: stefan2, philip, rhuijben


r1680451 | svn-role | 2015-05-19 23:00:59 -0500 (Tue, 19 May 2015)

Merge the r1680242 group from trunk:

 * r1680242, r1680264
   Stop removing last-change-* on non-updates of file externals (issue 4580)
   Justification:
     Resolves regression with 1.7.x/1.8.x pre 1.8.13, caused by issue 4411
     patch. This patch implements this fix in a better way and also fixes
     an incorrectly recorded url in text conflicts caused by updating a
     file external.
   Votes:
     +1: rhuijben, stsp, philip


r1680450 | svn-role | 2015-05-19 23:00:49 -0500 (Tue, 19 May 2015)

Remove the '1.8.x-r1680242' branch, merged in r1680449.

r1680449 | svn-role | 2015-05-19 23:00:34 -0500 (Tue, 19 May 2015)

Merge the 1.8.x-r1680242 branch:

 * r1680242
   Stop removing last-change-* on non-updates of file externals (issue 4580)
   Justification:
     Resolves regression with 1.7.x/1.8.x pre 1.8.13, caused by issue 4411
     patch. This patch implements this fix in a better way and also fixes
     an incorrectly recorded url in text conflicts caused by updating a
     file external.
   Notes:
     A test for this issue was added in r1680264, but that will require
     a more than trivial backport effort.
   Branch:
     ^/subversion/branches/1.8.x-r1680242
   Votes:
     +1: stsp, rhuijben, philip


r1680161 | svn-role | 2015-05-18 23:00:28 -0500 (Mon, 18 May 2015)

Merge r1675774 from trunk:

 * r1675774
   Use the /usr/libexec/java_home program to find the JDK on OSX.
   Justification:
     Without this change, we'll tend to find original 1.6 JDK on newer
     versions of OSX instead of the latest and/or default.
   Notes:
     Soak restart is not needed after this fix, IMO.
   Votes:
     +1: brane, rhuijben, stsp


r1680160 | svn-role | 2015-05-18 23:00:24 -0500 (Mon, 18 May 2015)

Merge the r1679228 group from trunk:

 * r1679228, r1679230, r1679909
   Extend test.
   Justification:
     May catch local-to-branch bugs.
   Depends: r1679169
   Votes:
     +1: ivan (without r1679909)
     +1: danielsh, rhuijben, stsp


r1680159 | svn-role | 2015-05-18 23:00:22 -0500 (Mon, 18 May 2015)

Merge the r1674455 group from trunk:

 * r1674455, r1674456
   Make 'svn cp ^/A/D/H@1 ^/A' properly create A
   Justification:
     Resurrecting a child as its own ancestor should work, instead of produce
     an error message on a non existing problem.
   Notes:
     Not a regression. Same issue exists in 1.7.x and 1.8.x
   Votes:
     +1: rhuijben, brane, stsp


r1680158 | svn-role | 2015-05-18 23:00:19 -0500 (Mon, 18 May 2015)

Merge the r1679169 group from trunk:

 * r1679169, r1679287
   fsfs freeze: Unlock rep-cache.db as part of unfreezing.
   Justification:
     Breaks commits for API users.
   Votes:
     +1: philip, danielsh, rhuijben, ivan


r1680157 | svn-role | 2015-05-18 23:00:13 -0500 (Mon, 18 May 2015)

Merge r1673153 from trunk:

 * r1673153
   Significantly improve 'svn ls -v' on tag directories
   Justification:
     Simple patch that avoids retrieving 'has_props' for every node, which
     is then ignored saves 95% of the server side processing time on
     end-user reported case.
   Votes:
     +1: rhuijben, ivan, stsp


r1679309 | svn-role | 2015-05-13 23:00:26 -0500 (Wed, 13 May 2015)

Merge r1679166 from trunk:

 * r1679166
   svnsync: Split --trust-server-cert-failures into separate options for the
   source and destination repositories.
   Justification:
     Allow controlling certificate acceptance separately for each server.
   Depends: r1678734 (already approved)
   Votes:
     +1: danielsh, philip, rhuijben (1.9.0 only)


r1679308 | svn-role | 2015-05-13 23:00:23 -0500 (Wed, 13 May 2015)

Merge the r1678734 group from trunk:

 * r1678734, r1678742, r1678745, r1678746, r1678839, r1678894
   Use --trust-server-cert-failures instead of separate options on cmdline
   Justification:
     Reduces the number of global options that have to be documented
     and handled everywhere. Gives the options more context on where they
     are used.
   Notes:
     r1678742 fixes test failures caused by mixed eols.
     r1678745 updates the bash completion script
     r1678746 extends the documentation to include information lost in r1678734
   Votes:
     +1: rhuijben, philip, brane, danielsh (1.9.0 only)


r1679307 | svn-role | 2015-05-13 23:00:19 -0500 (Wed, 13 May 2015)

Merge the r1674301 group from trunk:

 * r1674301, r1674305, r1674308, r1674339, r1674340, r1674475
   --config-option: Warn when the FILE:SECTION:OPTION combination may be
   invalid.
   Justification:
     Silently accepting invalid input is bad.
   Votes:
     +1: danielsh, rhuijben, brane (1.9.0 only)
         (Last minute change. Patch tested & Ok
          Not a problem if it only gets released in 1.10.0)
     -0.5: rhuijben (after 1.9.0. Changes error behaviour. Might break scripts)


r1679134 | svn-role | 2015-05-12 23:00:26 -0500 (Tue, 12 May 2015)

Merge r1678846 from trunk:

 * r1678846
   Change an assertion to an error.
   Justification:
     Invalid input shouldn't cause assertions.
   Depends: r1677440 (already approved)
   Votes:
     +1: danielsh, rhuijben, philip


r1679133 | svn-role | 2015-05-12 23:00:24 -0500 (Tue, 12 May 2015)

Merge r1678571 from trunk:

 * r1678571
   Fix false-positive acceptance via cmdline api of certificates with
   multiple failures of which some but not all were designated acceptable.
   Justification:
     Security issue.
   Notes:
     The issue does not exist in 1.8.x or earlier.
   Votes:
     +1: rhuijben, philip, stsp
     +0: danielsh (not tested)


r1678856 | svn-role | 2015-05-11 23:00:24 -0500 (Mon, 11 May 2015)

Merge r1677440 from trunk:

 * r1677440
   Support checksum (de-)serialization for all 1.9 checksum types.
   Justification:
     Public API must have a complete implementation.
   Votes:
     +1: stefan2, danielsh
     +1: rhuijben (1.9.0 only. Should be private api for >=1.9.1)


r1678855 | svn-role | 2015-05-11 23:00:22 -0500 (Mon, 11 May 2015)

Merge r1677003 from trunk:

 * r1677003
   Bump reqired Java version to 1.6 for JavaHL.
   Justification:
     Java 5 is dead. JavaHL 1.9+ uses 1.6 APIs.
   Votes:
     +1: brane, rhuijben, stefan2


r1678854 | svn-role | 2015-05-11 23:00:20 -0500 (Mon, 11 May 2015)

Merge the r1678147 group from trunk:

 * r1678147, r1678149
   Provide more informative error messages for FSFS parsing errors.
   Justification:
     "Serialized hash missing terminator" is a mostly useless error message.
   Votes:
     +1: stsp, rhuijben, stefan2


r1678853 | svn-role | 2015-05-11 23:00:17 -0500 (Mon, 11 May 2015)

Merge r1678494 from trunk:

 * r1678494
   Document svn:auto-props.
   Justification:
     Documentation should be complete.
   Votes:
     +1: danielsh, rhuijben, stefan2


r1677919 | svn-role | 2015-05-05 23:00:33 -0500 (Tue, 05 May 2015)

Merge r1597884 from trunk:

 * r1597884
   Fix Ruby tests so they don't use users real configuration.
   Justification:
     Makes check-swig-rb behave consistently regardless of the default
     configuration settings.
     .
     Fixes two Ruby test failures on my build box, where my default
     client config uses an external colorizing diff tool.
   Votes:
     +1: brane, julianfoad
     +0: rhuijben


r1677918 | svn-role | 2015-05-05 23:00:31 -0500 (Tue, 05 May 2015)

Remove the '1.8.x-r1676667' branch, merged in r1677917.

r1677917 | svn-role | 2015-05-05 23:00:15 -0500 (Tue, 05 May 2015)

Merge the 1.8.x-r1676667 branch:

 * r1676667, r1677267
   'EOF found' error when reading FSFS data (issue #4577).
   Justification:
     Without this change, users may not be able to read or modify the
     affected node(s), usually a directory.  While the data is not lost,
     it becomes inaccessible.
   Notes:
     The rather trivial fix is in r1676667, r1677267 adds a test case.
   Branch:
     ^/subversion/branches/1.8.x-r1676667
   Votes:
     +1: stefan2, brane, rhuijben
     +1: rschupp (non binding)


r1677739 | svn-role | 2015-05-04 23:00:15 -0500 (Mon, 04 May 2015)

Merge the r1676667 group from trunk:

 * r1676667, r1677267
   'EOF found' error when reading FSFS data (issue #4577).
   Justification:
     Without this change, users may not be able to read or modify the
     affected node(s), usually a directory.  While the data is not lost,
     it becomes inaccessible.
   Notes:
     The rather trivial fix is in r1676667, r1677267 adds a test case.
   Votes:
     +1: stefan2, brane, rhuijben


r1677738 | svn-role | 2015-05-04 23:00:14 -0500 (Mon, 04 May 2015)

Merge the r1674415 group from trunk:

 * r1674415, r1676538, r1676570
   Fix a spurious no-op property changes from 'svn copy --pin-externals'.
   Justification:
     Client should avoid sending no-op prop changes. Discussion:
     http://mail-archives.apache.org/mod_mbox/subversion-dev/201504.mbox/%3C5537E14B.8030303%40syntevo.com%3E
   Notes:
     r1674415 is needed to make r1676570 merge without conflicts.
   Votes:
     +1: stsp, brane, rhuijben


r1677737 | svn-role | 2015-05-04 23:00:12 -0500 (Mon, 04 May 2015)

Merge r1677191 from trunk:

 * r1677191
   Fix client pool SEGV with ra-local and --enable-runtime-module-search.
   Justification:
     Regression from 1.8.x, just about any ra-local/DSO operation can fail.
   Votes:
     +1: philip, brane, rhuijben


r1677736 | svn-role | 2015-05-04 23:00:10 -0500 (Mon, 04 May 2015)

Merge the r1676526 group from trunk:

 * r1676526, r1676535
   Fix working copy operations (checkout, update) with very long path names
   on Windows. See http://svn.haxx.se/users/archive-2015-04/0105.shtml
   Justification:
     Bug in primary use case (checkout and update). Regression from 1.8.x.
   Votes:
     +1: ivan, rhuijben
     +1: brane (not tested, but fix looks obviously correct)


r1677095 | svn-role | 2015-04-30 23:00:27 -0500 (Thu, 30 Apr 2015)

Merge the r1675771 group from trunk:

 * r1675771, r1676555, r1676564, r1676769
   Fix a bunch of native-memory leaks in JavaHL.
   Justification:
     Memory leaks are bad. This fix should go into .0 because
     it affects JavaHL APIs that are new in 1.9 and also some
     existing 1.8 APIs that previously did not leak.
   Notes:
     Soak restart is not needed after this fix, IMO.
   Votes:
     +1: brane, philip


r1676896 | svn-role | 2015-04-29 23:00:18 -0500 (Wed, 29 Apr 2015)

Merge r1676665 from trunk:

 * r1676665
   Fix JavaHL 1.8-compatibility wrapper for ISVNClient.cleanup.
   Justification:
     This change should go into 1.9.0 because it fixes
     an incorrect API semantics change compared to 1.8.
   Notes:
     Soak restart is not needed after this fix, IMO.
   Votes:
     +1: brane, philip


r1676895 | svn-role | 2015-04-29 23:00:16 -0500 (Wed, 29 Apr 2015)

Merge r1674522 from trunk:

 * r1674522
   Skip the 'upgrade_tests.py 36: automatic SQLite ANALYZE' test on old pythons
   Justification:
     Our testsuite shouldn't fail just because python has an old sqlite
     version compiled in.
   Notes:
     This nomination is partially to just mark this problem as a 'known issue'.
   Votes:
     +1: rhuijben, brane, philip


r1674729 | svn-role | 2015-04-19 23:00:17 -0500 (Sun, 19 Apr 2015)

Merge r1674627 from trunk:

 * r1674627
   Prevent a mod_dav tree walk on copy sources (issue #4531).
   Justification:
     Current HTTPD releases ship a mod_dav bug fix which broke
     'svn copy' constant time guarantees.
   Votes:
     +1: stsp, gstein, rhuijben


r1674728 | svn-role | 2015-04-19 23:00:11 -0500 (Sun, 19 Apr 2015)

Merge r1674627 from trunk:

 * r1674627
   Prevent a mod_dav tree walk on copy sources (issue #4531).
   Justification:
     Current HTTPD releases ship a mod_dav bug fix which broke
     'svn copy' constant time guarantees.
   Votes:
     +1: stsp, gstein, rhuijben


r1674595 | svn-role | 2015-04-18 23:00:09 -0500 (Sat, 18 Apr 2015)

Merge the r1667699 group from trunk:

 * r1667699, r1667700, r1674487
   Fix an array allocation problem in the r1667228 group
   Justification:
     Using a 0 element array to store values in doesn't really work and luckily
     some compilers warn us for this problem.
   Votes:
     +1: brane, rhuijben, stsp


r1674440 | svn-role | 2015-04-17 23:00:47 -0500 (Fri, 17 Apr 2015)

Merge r1674406 from trunk:

 * r1674406
   Fix implementation of svn_client_copy7 with pin-externals enabled to match
   the documented behaviour.
   Justification:
     The API docs were correct but the implementation was not.
   Note:
     Has to be part of a .0 release because it affects public API semantics.
   Votes:
     +1: brane, stsp
     +1: rhuijben (+1 on libsvn_client change.
                   +0 for the JavaHL testcase
                      (this part just tested, not 100% reviewed))


r1674439 | svn-role | 2015-04-17 23:00:46 -0500 (Fri, 17 Apr 2015)

Merge the r1666965 group from trunk:

 * r1666965, r1667120
   mod_dav_svn: Emit the first few 'svn log' items as soon as they are available.
   Justification:
     A slow svn log makes users call Subversion slow. This fixes the
     perceived performance problem by no longer optimizing just for
     obtaining all the results fast, but also for obtaining the first
     result fast.
     .
     Just the perceived slowness of common svn log operations might
     make users switch to a DVCS, while this slowness is just a buffering
     to make the total set of results come in faster. But I don't think
     there are that many users that really wait for all results of
     .
     $ svn log -q ^/subversion/trunk
     .
     This currently takes > 10 seconds before the first result using
     the EU mirror for me. By comparison, 'svn log --limit=1' takes
     0.2 seconds.
   Votes:
     +1: rhuijben, philip, brane
     +0: julianfoad (reviewed but not tested;
                     figures given in justification are for a 1.8 server but
                     a 1.9 server should have vastly quicker log computation)
     -0.5: kotkov (could not reproduce the improvement with a real-world 1.9
                   server; see my e-mail to <dev@subversion.apache.org>)


r1674438 | svn-role | 2015-04-17 23:00:44 -0500 (Fri, 17 Apr 2015)

Merge r1664035 from trunk:

 * r1664035
   Keep track of changes when a file external is replace by a real file
   Justification:
     When a file-external is deleted, there might be a real node that
     want to take its place. This patch makes svn update introduce a
     not present marker node, so a follow-up update will bring in the
     new file (that was previously reported as skipped)
   Notes:
     To implement this some features had to be added to the generic
     base remove function.
   Votes:
     +1: rhuijben, brane, philip


r1674437 | svn-role | 2015-04-17 23:00:42 -0500 (Fri, 17 Apr 2015)

Merge the r1663671 group from trunk:

 * r1663671, r1666832
   Resolve an assertion on a bad update report involving incomplete status
   Justification:
     The tree conflict detection logic in the update editor wasn't
     designed to handle BASE adds, where the is an existing basenode. This
     patch makes the update logic handling properly handle this bad state
     for incomplete nodes, like it already does for status normal nodes.
     .
     Resolves a reproducable assertion in an restarted checkout against
     github.
   Votes:
     +1: rhuijben, stefan2, brane


r1674436 | svn-role | 2015-04-17 23:00:40 -0500 (Fri, 17 Apr 2015)

Merge the r1667228 group from trunk:

 * r1667228, r1667234, r1667249, r1667250, r1667258, r1667290, r1667691, r1667692, r1667693
   Fix various problems with binary file conflicts.
   Justification:
     Conflict description API violates its own promises for binaries.
     Current behaviour can cause user confusion since conflict prompt
     options for binary files won't work as expected.
   Notes:
     r1667258, r1667290 resolve a performance regression introduced by the
     code which now needs the actual property values. It also avoids creating temporary
     files for property conflicts in cases where a caller can never use them.
   Votes:
     +1: rhuijben, stefan2, brane, philip
     +1: stsp (r1667228, r1667234, r1667249, r1667250, r1667691, r1667692, r1667693 only)


r1674435 | svn-role | 2015-04-17 23:00:34 -0500 (Fri, 17 Apr 2015)

Remove the '1.9.x-r1664664' branch, merged in r1674434.

r1674434 | svn-role | 2015-04-17 23:00:19 -0500 (Fri, 17 Apr 2015)

Merge the 1.9.x-r1664664 branch:

 * r1664664, r1664672, r1664674
   Make detection of invalid (newer than HEAD) base revision on commit behave
   the same on all RA layers.
   Justification:
     The error was visible when the http-v1 dav protocol was used. I think it
     is a better fix to backport the check to the other layers than to hide
     the problem.
   Branch:
     ^/subversion/1.9.x-r1664664
   Votes:
     +1: rhuijben, philip, brane
     +1: stefan2 (before branch)


r1674433 | svn-role | 2015-04-17 23:00:16 -0500 (Fri, 17 Apr 2015)

Merge the r1665213 group from trunk:

 * r1665213, r1665259, r1665609
   Fix cases of serf's svn_ra_get_dir2() and svn_ra_get_log2() breaking the
   ra session for further operations.
   Justification:
     Without this fix the next session usage after this operation may
     accidentally process the result of a still outstanding request.
     .
     svn_ra_get_dir2() and svn_ra_get_log2() are the easy to trigger examples,
     but propfind requests are just as vulnerable for keeping requests
     registered after returning with some error... If there wasn't a lucky pool
     cleanup inbetween further ra operations might access already freed memory,
     because the request continues processing.
   Notes:
     If caller just passed a scratch pool for a single request things would
     usually have worked fine, but if not...
   Votes:
     +1: rhuijben, stefan2, brane


r1674432 | svn-role | 2015-04-17 23:00:14 -0500 (Fri, 17 Apr 2015)

Merge the r1663991 group from trunk:

 * r1663991, r1666258, r1674032
   Fix calculating the repository path after commits of nodes that are
   shadowing a switched (not-present) node.
   Justification:
     Allows introducing repository paths in the working copy, that don't
     reflect the repository state.
   Votes:
     +1: rhuijben, philip, brane


r1674205 | svn-role | 2015-04-16 23:00:28 -0500 (Thu, 16 Apr 2015)

Merge r1674170 from trunk:

 * r1674170
   doc: Update svn_ra_get_dir2()'s docstring.
   Votes:
     +1: danielsh


r1674204 | svn-role | 2015-04-16 23:00:26 -0500 (Thu, 16 Apr 2015)

Merge the r1673197 group from trunk:

 * r1673197, r1673202, r1673204
   Avoid filling the representation cache with unneeded property info
   Justification:
     Not reading actual properties during 'svn ls -v' avoids trashing the
     memory cache that in this case might just drop the directory we are
     currently processing, causing a significant performance drop on
     tags directories above a certain size.
   Notes:
     Depends on the r1673170 group being backported to 1.9.0.
   Votes:
     +1: rhuijben, stefan2, philip


r1674203 | svn-role | 2015-04-16 23:00:21 -0500 (Thu, 16 Apr 2015)

Merge the r1673170 group from trunk:

 * r1673170, r1673172, r1673692, r1673746
   Introduce svn_fs_node_has_props() and use it where applicable
   Justification:
     Checking whether there are properties should be more efficient than
     retrieving all properties and then counting them. For directories above
     a certain size this takes > 95% of the processing time of 'svn ls -v'
   Notes:
     This patch just provides the api and updates callers to use it. Further
     patches (that are not 1.9.0 only) may then improve performance per
     filesystem implementation.
   Votes:
     +1: rhuijben, stefan2, philip, danielsh (for 1.9.0 only)


r1674202 | svn-role | 2015-04-16 23:00:18 -0500 (Thu, 16 Apr 2015)

Merge the r1664593 group from trunk:

 * r1664593, r1664594, r1664596, r1667715
   On Windows allow reading configuration from system services
   Justification:
     In system services Subversion might be running as a very limited
     user that doesn't have a user profile (including user registry)
     loaded. In this case 1.9 currently fails without a proper error,
     where somehow 1.8 didn't see an error at all.
     .
     Some SharpSvn users use Subversion directly from their webserver
     to contact a Subversion server or read from an repository, to
     present a management interface... This causes some problems for
     these users.
   Notes:
     Easier to review the combined result as most patches partially
     undo the previous one.
   Votes:
     +1: rhuijben, ivan
     +1: stefan2, brane, jcorvel (not tested but change looks clear enough
                                  and is limited to error handling on Windows)


r1674201 | svn-role | 2015-04-16 23:00:16 -0500 (Thu, 16 Apr 2015)

Merge r1674015 from trunk:

 * r1674015
   Let 'svnbench null-blame' accept a revision range.
   Justification:
     Necessary to be able to benchmark 'prospective blame', since that
     requires running the command with a reverse revision range. It would
     be interesting to test whether a server / backend can deliver the
     file revs faster in reverse.
   Votes:
     +1: jcorvel, rhuijben, danielsh


r1674003 | svn-role | 2015-04-15 23:00:47 -0500 (Wed, 15 Apr 2015)

Merge the r1673785 group from trunk:

 * r1673785, r1673803
   Add a 'null-blame' command to svnbench
   Justification:
     Provides a tool to end users for diagnosing performance problems. Doesn't affect other
     code and otherwise we can only add it at 1.10.
   Votes:
     +1: rhuijben, stefan2, jcorvel


r1674002 | svn-role | 2015-04-15 23:00:43 -0500 (Wed, 15 Apr 2015)

Merge r1673153 from trunk:

 * r1673153
   Significantly improve 'svn ls -v' on tag directories
   Justification:
     Simple patch that avoids retrieving 'has_props' for every node, which
     is then ignored saves 95% of the server side processing time on
     customer reported case.
   Votes:
     +1: rhuijben, stefan2, philip


r1674001 | svn-role | 2015-04-15 23:00:41 -0500 (Wed, 15 Apr 2015)

Merge r1667471 from trunk:

 * r1667471
   Fix bad assertion in diff callbacks
   Justification:
     Problem uncovered by 1.8.x code that still use these callbacks. On 1.9.x
     this code is only used from some deprecated libsvn_wc functions that
     used to drive the old diff code. Some third party tools might hit this
     problem.
   Votes:
     +1: rhuijben, stefan2, philip


r1674000 | svn-role | 2015-04-15 23:00:38 -0500 (Wed, 15 Apr 2015)

Merge the r1672295 group from trunk:

 * r1672295, r1673691
   Fix Sqlite 3.8.9 query performance regression on externals
   Justification:
     The regression tests shouldn't fail.
     (And the query performance on working copies with an extreme
      number of externals defined on different paths shouldn't
      regress)
   Votes:
     +1: rhuijben, philip, brane


r1673999 | svn-role | 2015-04-15 23:00:35 -0500 (Wed, 15 Apr 2015)

Merge the r1669743 group from trunk:

 * r1669743, r1669945
   Restore FSFS representation sharing to its previous effectiveness.
   Justification:
     Without this patch, repositories may grow faster than necessary.
     Effected users include those that use plain add instead of copy to
     create branches and those that merge frequently between branches.
   Notes:
     r1669945 fixes the replacement condition and provides a test.
   Votes:
     +1: stefan2, danielsh, rhuijben


r1673998 | svn-role | 2015-04-15 23:00:30 -0500 (Wed, 15 Apr 2015)

Merge the r1673044 group from trunk:

 * r1673044, r1673063, r1673065
   Allow the auth command to match on certificate details
   Justification:
     This was part of the whole point of the auth command, but got dropped
     inadvertently as part of the conversion to using an X.509 parser.
   Votes:
     +1: breser, stefan2, rhuijben


r1673643 | svn-role | 2015-04-14 23:01:46 -0500 (Tue, 14 Apr 2015)

Merge r1673062 from trunk:

 * r1673062
   Fix 2 error leaks in the X.509 code.
   Justification:
     Error leaks are bad and no reason to leave them unfixed.
   Votes:
     +1: breser, philip, stefan2


r1673642 | svn-role | 2015-04-14 23:01:44 -0500 (Tue, 14 Apr 2015)

Merge r1668320 from trunk:

 * r1668320
   ra_serf: resolve minor memory leak against very old servers
   Justification:
     ra operations shouldn't unnecessary grow the session pool.
   Votes:
     +1: rhuijben, philip, stefan2


r1673641 | svn-role | 2015-04-14 23:01:43 -0500 (Tue, 14 Apr 2015)

Merge the r1671164 group from trunk:

 * r1671164, r1672578, r1673228
   Enable passing '-r' to 'svn status'
   Justification:
     Allows checking what changes when updating to some specific revision
     vs only to HEAD.
   Notes:
     We supported this feature in the libsvn_client api since <= 1.0.
   Votes:
     +1: philip, rhuijben, stefan2 (for 1.9.0 only)


r1673640 | svn-role | 2015-04-14 23:01:40 -0500 (Tue, 14 Apr 2015)

Remove the '1.9.x-r1667233' branch, merged in r1673639.

r1673639 | svn-role | 2015-04-14 23:01:24 -0500 (Tue, 14 Apr 2015)

Merge the 1.9.x-r1667233 branch:

 * r1667233, r1667301
   Reject invalid get-location-segments requests in mod_dav_svn and svnserve.
   Justification:
     Security issue.
   Notes:
     r1667233 is the fix itself.  r1667301 fixes svnserve protocol violation
     when the sanity check in get_location_segments() fails.  The backport
     branch is required to avoid a trunk-specific behavior change in terms
     of the error code, i.e., to still use the SVN_ERR_INCORRECT_PARAMS
     instead of the SVN_ERR_FS_NO_SUCH_REVISION.
   Branch:
     ^/subversion/branches/1.9.x-r1667233
   Votes:
     +1: kotkov, philip, stefan2
     -0: rhuijben (causes an svn protocol error without further patches such
                   as the patch applied in r1667301; vote happened before
                   the '1.9.x-r1667233' backport branch)


r1673638 | svn-role | 2015-04-14 23:01:20 -0500 (Tue, 14 Apr 2015)

Merge r1673282 from trunk:

 * r1673282
   Rename svn_relpath_limit to svn_relpath_prefix in the public API.
   Justification:
     This is a more appropriate name for this new function.
   Notes:
     If this does not become part of 1.9.0, r1673282 needs to be reverted
     on /trunk.
   Votes:
     +1: stefan2, rhuijben, philip


r1673637 | svn-role | 2015-04-14 23:01:15 -0500 (Tue, 14 Apr 2015)

Merge r1669746 from trunk:

 * r1669746
   Rename svn_fs_node_same to svn_fs_node_unchanged in FS API.
   Justification:
     This clarifies the new "node relationship" concept introduced in 1.9.
     Neither calling it "same" (too strict) nor "equal" (too loose) would
     imply the intended semantics.  The sloppy and easily misinterpreted
     semantics of the similar svn_fs_compare_ids lead to false and fragile
     code (e.g. issue #4542).  Let's not repeat this.
   Votes:
     +1: stefan2, philip, stsp


r1673636 | svn-role | 2015-04-14 23:01:08 -0500 (Tue, 14 Apr 2015)

Merge r1673445 from trunk:

 * r1673445
   Correct the FSFS structure description.
   Justification:
     Have correct documentation.
   Notes:
     This is a documentation-only fix and does not require additional
     voting.
   Votes:
     +1: stefan2


r1673635 | svn-role | 2015-04-14 23:01:05 -0500 (Tue, 14 Apr 2015)

Merge the r1668607 group from trunk:

 * r1668607, r1670337
   Fixes to the public svn_diff API declarations and documentation.
   Justification:
     Have a complete, correct and easily accessible API description.
     None of these changes should affect generated code nor the ABI.
   Votes:
     +1: stefan2, rhuijben, philip


r1673634 | svn-role | 2015-04-14 23:01:01 -0500 (Tue, 14 Apr 2015)

Merge the r1668599 group from trunk:

 * r1668599, r1668608
   Fixes to the public svn_io API declarations and documentation.
   Justification:
     Have a complete, correct and easily accessible API description.
     None of these changes should affect generated code nor the ABI.
   Votes:
     +1: stefan2, rhuijben, philip


r1673633 | svn-role | 2015-04-14 23:00:58 -0500 (Tue, 14 Apr 2015)

Merge the r1672372 group from trunk:

 * r1672372, r1672404
   Stop parsing the result of a succeeded PUT as xml error chain
   Justification:
     Reported as breaking compatibility with Sourceforge's setup.
     Reported as release blocker in the 'error committing to 1.7 servers'
     thread on dev@s.a.o.
   Notes:
     Apache Httpd 2.4 appears to return a proper xml result and as such
     doesn't generate an error. I'm guessing you need an older httpd or
     a special setup to reproduce the problem.
   Votes:
     +1: rhuijben, steveking, philip


r1673632 | svn-role | 2015-04-14 23:00:54 -0500 (Tue, 14 Apr 2015)

Merge r1672311 from trunk:

 * r1672311
   Fix some doc and pass problems on the deprecated svn_wc_add_from_disk2
   Justification:
     Simple fix to resolve a case where new properties are lost on add.
   Notes:
     Regression from 1.8 for API users.
   Votes:
     +1: rhuijben, danielsh, philip


r1673350 | svn-role | 2015-04-13 23:00:46 -0500 (Mon, 13 Apr 2015)

Merge r1667235 from trunk:

 * r1667235
   Reject invalid transaction property change requests in mod_dav_svn.
   Justification:
     Security issue.
   Votes:
     +1: kotkov, rhuijben, philip


r1673349 | svn-role | 2015-04-13 23:00:43 -0500 (Mon, 13 Apr 2015)

Merge the r1670139 group from trunk:

 * r1670139, r1670149, r1670152, r1670347
   Lock-many pool handling and doc fixes as a result of API review.
   Justification:
     Better memory handling for callback, clearer documentation.
   Votes:
     +1: stefan2, rhuijben, philip


r1672978 | svn-role | 2015-04-11 23:00:51 -0500 (Sat, 11 Apr 2015)

Merge r1672512 from trunk:

 * r1672512
   Correct docstrings for 1.9 functions in svn_wc.h
   Justification:
     Have a complete, correct and easily accessible API description.
   Notes:
     Docstring-only patch. Acceptable with a single vote.
     Via IRC, Bert gave his o.k. for the /trunk change.
   Votes:
     +1: stefan2


r1672977 | svn-role | 2015-04-11 23:00:49 -0500 (Sat, 11 Apr 2015)

Merge r1672511 from trunk:

 * r1672511
   Correct a docstring in svn_repos.h
   Justification:
     Have a complete, correct and easily accessible API description.
   Notes:
     Docstring-only patch. Acceptable with a single vote.
   Votes:
     +1: stefan2


r1672810 | svn-role | 2015-04-10 23:00:44 -0500 (Fri, 10 Apr 2015)

Merge r1670353 from trunk:

 * r1670353
   In the SVN_VA_NULL macro, make the implementation type private.
   Justification:
     No need to be public, so keep the API and its public documentation
     smaller.
   Votes:
     +1: julianfoad, stefan2, danielsh


r1672003 | svn-role | 2015-04-07 23:00:13 -0500 (Tue, 07 Apr 2015)

Merge the r1668618 group from trunk:

 * r1668618, r1671388
   Fix stack memory problem for SWIG Perl bindings.
   Justification:
     Possible stack corruption leading to SEGV.
   Votes:
     +1: philip
     +0: rhuijben


r1672002 | svn-role | 2015-04-07 23:00:10 -0500 (Tue, 07 Apr 2015)

Merge the r1668618 group from trunk:

 * r1668618, r1671388
   Fix stack memory problem for SWIG Perl bindings.
   Justification:
     Possible stack corruption leading to SEGV.
   Votes:
     +1: philip
     +0: rhuijben


r1672001 | svn-role | 2015-04-07 23:00:07 -0500 (Tue, 07 Apr 2015)

Merge the r1668618 group from trunk:

 * r1668618, r1671388
   Fix stack memory problem for SWIG Perl bindings.
   Justification:
     Possible stack corruption leading to SEGV.
   Votes:
     +1: philip
     +0: rhuijben


r1670997 | svn-role | 2015-04-02 23:00:24 -0500 (Thu, 02 Apr 2015)

Merge r1669749 from trunk:

 * r1669749
   Make the new svn_fs_dir_optimal_order use two pools.
   Justification:
     New code should use the two-pool paradigm.  Hence, all new API should
     allow users to do so.
   Notes:
     This is not strictly blocking 1.9 but if we don't merge it, we need to
     revert it on /trunk as well.
   Votes:
     +1: stefan2, rhuijben, brane


r1670996 | svn-role | 2015-04-02 23:00:20 -0500 (Thu, 02 Apr 2015)

Merge the r1664938 group from trunk:

 * r1664938, r1664939, r1664940, r1664978, r1664984
   libsvn_javahl: wrap and unwrap java exceptions via svn_error_t
   Justification:
     This patch makes Java callbacks that throw errors report
     their error to the subversion function that called them. This
     allows this function to properly handle the error condition instead
     of continuing as if nothing happened. If further callbacks are needed
     during error handling these callbacks will now just work and Subversion
     can ignore certain kinds of errors as needed, by just clearing the error.
   Votes:
     +1: rhuijben (not after 1.9.0), brane


r1670556 | svn-role | 2015-03-31 23:00:12 -0500 (Tue, 31 Mar 2015)

Merge r1665318 from trunk:

 * r1665318
   Make lock/unlock result reporting consistent over ra layers and fs backends
   Justification:
     With the 1.9 redesign of multiple locks in a single operation differences
     between the different ra layers were introduced in how out of date
     revisions are reported. This patch makes the behavior consistent, which
     in turn will help clients produce a more stable result.
     (This resolves multiple long standing AnkhSVN issues that I wasn't
      aware of)
     .
     Without this patch some ra layers report out of dates via the callback
     while others (read: serf) fail directly, causing locks not to be stored
     in the working copy, etc.
   Notes:
     The regression test on trunk tests a bit more behavior than is backported
     here. Check r1665319 for details on what is ensured on trunk now.
   Votes:
     +1: rhuijben, philip, stefan2


r1670555 | svn-role | 2015-03-31 23:00:10 -0500 (Tue, 31 Mar 2015)

Merge r1663355 from trunk:

 * r1663355
   Fix #include guards and Doxygen mark-up that does not match a file's actual
   name.
   Justification:
     Simple corrections to documentation and source code; no functional
     change. The only public symbol affected is the include-guard symbol
     SVN_OPTS_H renamed to SVN_OPT_H.
   Votes:
     +1: julianfoad, rhuijben, stefan2


r1670554 | svn-role | 2015-03-31 23:00:08 -0500 (Tue, 31 Mar 2015)

Merge r1670329 from trunk:

 * r1670329
   Fixes to the public svn_client API documentation.
   Justification:
     Have a complete, correct and easily accessible API description.
     None of these changes should affect generated code nor the ABI.
   Votes:
     +1: stefan2, rhuijben


r1670248 | svn-role | 2015-03-30 23:00:12 -0500 (Mon, 30 Mar 2015)

Merge the r1665894 group from trunk:

 * r1665894, r1667101
   Fix the noderev relatedness checks for FSFS (and FSX).
   Justification:
     Without this, the new public API function will return false results
     when comparing nodes from different transactions.  That constallation
     does not occur in our code but API users may want to use it to e.g.
     detect conflicts between transactions early.
   Votes:
     +1: stefan2, julianfoad, rhuijben


r1669986 | svn-role | 2015-03-29 23:00:12 -0500 (Sun, 29 Mar 2015)

Merge r1668603 from trunk:

 * r1668603
   Fixes to the public svn_wc API documentation.
   Justification:
     Have a complete, correct and easily accessible API description.
     None of these changes should affect generated code nor the ABI.
   Votes:
     +1: stefan2


r1669985 | svn-role | 2015-03-29 23:00:10 -0500 (Sun, 29 Mar 2015)

Merge r1668602 from trunk:

 * r1668602
   Fixes to the public svn_string API documentation.
   Justification:
     Have a complete, correct and easily accessible API description.
     None of these changes should affect generated code nor the ABI.
   Votes:
     +1: stefan2


r1669984 | svn-role | 2015-03-29 23:00:08 -0500 (Sun, 29 Mar 2015)

Merge r1668600 from trunk:

 * r1668600
   Fixes to the public RA layer API documentation.
   Justification:
     Have a complete, correct and easily accessible API description.
     None of these changes should affect generated code nor the ABI.
   Votes:
     +1: stefan2


r1669983 | svn-role | 2015-03-29 23:00:07 -0500 (Sun, 29 Mar 2015)

Merge r1668598 from trunk:

 * r1668598
   Fixes to the public svn_config API documentation.
   Justification:
     Have a complete, correct and easily accessible API description.
     None of these changes should affect generated code nor the ABI.
   Votes:
     +1: stefan2


r1669273 | svn-role | 2015-03-25 23:00:07 -0500 (Wed, 25 Mar 2015)

Merge the r1667941 group from trunk:

 * r1667941, r1667976
   Bump copyright year.
   Justification:
     We won't release 1.9.0 last year.
   Votes:
     +1: brane, philip, julianfoad
     +0: rhuijben (concept. Not reviewed)


r1668191 | svn-role | 2015-03-20 23:00:55 -0500 (Fri, 20 Mar 2015)

Merge the r1667941 group from trunk:

 * r1667941, r1667976
   Bump copyright year.
   Justification:
     We won't make more 1.8.x releases in 2014.
   Votes:
     +1: brane, julianfoad, philip


r1668190 | svn-role | 2015-03-20 23:00:48 -0500 (Fri, 20 Mar 2015)

Remove the '1.7.x-r1667941' branch, merged in r1668189.

r1668189 | svn-role | 2015-03-20 23:00:32 -0500 (Fri, 20 Mar 2015)

Merge the 1.7.x-r1667941 branch:

 * r1667941, r1667976
   Bump copyright year.
   Justification:
     We won't make more 1.7.x releases in 2014.
   Branch:
     ^/subversion/branches/1.7.x-r1667941
   Votes:
     +1: brane, julianfoad, philip


r1667844 | svn-role | 2015-03-19 13:24:28 -0500 (Thu, 19 Mar 2015)

Merge the r1665438 group from trunk:

 * r1665438, r1667107
   Fixes to the public Repos layer API declarations and documentation.
   Justification:
     Have a complete, correct and easily accessible API description.
     None of these changes should affect generated code nor the ABI.
   Votes:
     +1: stefan2, julianfoad, rhuijben


r1667843 | svn-role | 2015-03-19 13:24:24 -0500 (Thu, 19 Mar 2015)

Merge the r1665437 group from trunk:

 * r1665437, r1665896, r1666449, r1667106
   Fixes to the public FS API declarations and documentation.
   Justification:
     Have a complete, correct and easily accessible API description.
     None of these changes should affect generated code nor the ABI.
   Votes:
     +1: stefan2, julianfoad, rhuijben


r1667842 | svn-role | 2015-03-19 13:24:20 -0500 (Thu, 19 Mar 2015)

Merge the r1665195 group from trunk:

 * r1665195, r1666096, r1666379
   Produce an easier to understand error when a server sends a HTTP 405 code
   Justification:
     Just reporting out of date doesn't hint a user that he should
     switch/relocate to the location where he is allowed to commit.
   Votes:
     +1: rhuijben, brane, stefan2


r1667841 | svn-role | 2015-03-19 13:24:15 -0500 (Thu, 19 Mar 2015)

Merge r1664997 from trunk:

 * r1664997
   Fix test failures when running from a directory whose name contains
   characters which must be escaped when used in a URL.
   Justification:
     User reported problem when testing 1.9 beta.
   Votes:
     +1: rhuijben, brane, stefan2


r1667840 | svn-role | 2015-03-19 13:24:11 -0500 (Thu, 19 Mar 2015)

Merge r1664684 from trunk:

 * r1664684
   svnrdump: don't provide HEAD+1 as base revision when loading deletes.
   Justification:
     Our own tools should be well behaved.
   Votes:
     +1: rhuijben, brane, stefan2


r1667839 | svn-role | 2015-03-19 13:24:07 -0500 (Thu, 19 Mar 2015)

Merge r1664653 from trunk:

 * r1664653
   Fix segfault when performing 'svn cp --pin-externals WC URL' against old
   server over http.
   Justification:
     Fixes segfault on --disable-http-v2.
   Votes:
     +1: rhuijben, brane, stefan2


r1667838 | svn-role | 2015-03-19 13:24:04 -0500 (Thu, 19 Mar 2015)

Merge r1664193 from trunk:

 * r1664193
   Fix win32 resource generation for svnbench.exe
   Justification:
     Trivial change to generate version resource for application.
   Votes:
     +1: rhuijben, brane, stefan2


r1667837 | svn-role | 2015-03-19 13:24:00 -0500 (Thu, 19 Mar 2015)

Merge r1663738 from trunk:

 * r1663738
   Stop exposing and prohibit changing internal txn props through FS API
   Justification:
     Prevents an implementation detail leak.  Prohibits changing the
     internal behavior of our transactions via public API.  Avoids a situation
     with the API function call discarding the data and falsely reporting
     success for "set" operations with 'svn:client-date' properties, i.e.,
     with the API telling us that the operation completed successfully when
     the change itself was not applied.  (The last part is new-in-1.9.)
   Notes:
     While this is mostly an API correctness fix, there is a user-visible
     consequence of 'svnlook proplist' no longer leaking internal properties
     like svn:check-locks for transactions.
   Votes:
     +1: kotkov, rhuijben, stefan2
     +0: philip (the new behaviour is fine but so is the old behaviour.
         svn:client-date is internal so does not have to obey the
         rules that apply to user properties. The proplist "leak" is
         strictly a regression as it is no longer possible to determine
         whether the CHECK_LOCKS flag is set on a txn.)


r1667836 | svn-role | 2015-03-19 13:23:57 -0500 (Thu, 19 Mar 2015)

Merge r1663791 from trunk:

 * r1663791
   Trivial typo fix in error message.
   Justification:
     Fixes a typo.
   Votes:
     +1: brane, rhuijben, stefan2


r1667835 | svn-role | 2015-03-19 13:23:52 -0500 (Thu, 19 Mar 2015)

Merge the r1663183 group from trunk:

 * r1663183, r1663184
   Introduce build support for Visual Studio "2015"
   Justification:
     Unbreaks building with the VS version that should be released somewhere
     later this year.
   Notes:
     Includes a few generator fixes, and compilation fixes of utf8proc.c.
   Votes:
     +1: rhuijben, brane, stefan2


r1667834 | svn-role | 2015-03-19 13:23:48 -0500 (Thu, 19 Mar 2015)

Merge r1666690 from trunk:

 * r1666690
   Record skipped tree during merge on the skip root instead of leaves
   Justification:
     Resolves a user reported problem in merge handling. Avoids unnecessary
     mergeinfo recording on multiple leaves when a single ancestor is shadowed.
   Votes:
     +1: rhuijben, brane, philip


r1667833 | svn-role | 2015-03-19 13:23:43 -0500 (Thu, 19 Mar 2015)

Merge r1666851 from trunk:

 * r1666851
   Make JavaHL fetch all revision properties when the api promises too.
   Justification:
     Simple bugfix makes new in 1.9 code do what it was designed to do.
   Votes:
     +1: rhuijben, brane


r1667832 | svn-role | 2015-03-19 13:23:38 -0500 (Thu, 19 Mar 2015)

Merge the r1666270 group from trunk:

 * r1666270, r1666272
   Resolve a segfault when an update introduces a conflict on the update root
   Justification:
     Regression from 1.8.x.
   Votes:
     +1: rhuijben, philip, brane


r1667830 | svn-role | 2015-03-19 13:23:34 -0500 (Thu, 19 Mar 2015)

Merge the r1663338 group from trunk:

 * r1663338, r1663347, r1663374
   Properly record resolving of individual property conflicts.
   Justification:
     Fixes a few implementation bugs in the resolver code and exposes the
     api for more users than those that pass a callback function.
   Notes:
     Bert says it changes a public API and so needs to go into 1.9.0: see
     http://colabti.org/irclogger/irclogger_log/svn-dev?date=2015-03-10#l93
     .
     rhuijben: While the new feature of allowing the resolving of individual
     properties is not a release blocker to me, the known buggy behavior of
     the current code that may cause unuexpected loss of properties and
     conflict data is.
     .
     The part of the patch that enables the new feature is very small
     compared to the part that fixes the issue, and the regression
     test would be at least tree times harder to write and review without
     enabling the resolving of individual property conflicts.
     .
     Note that not being able to resolve individual property conflicts
     on update/switch/merge is a regression against 1.7.x, where we didn't
     switch to resolving after the update completed yet.
     .
   Votes:
     +1: rhuijben, philip
     +1: brane (But there's no API change here, no public headers are
                modified by the backport merge.)


r1667829 | svn-role | 2015-03-19 13:23:29 -0500 (Thu, 19 Mar 2015)

Merge the r1664078 group from trunk:

 * r1664078,r1664080,r1664187,r1664191,r1664200,r1664344,r1664588,r1664927,r1665886
   Instead of making more changes to the auth batons from ra sessions, reduce
   the number of changes by introducing an internal slave auth baton feature.
   Justification:
     Without this patch (or a complete redesign of the auth layer), the
     ra sessions cache (currently on a feature branch), will open the ra
     sessions from outside configuration changes caused by opening other
     ra sessions. This patch not only reverts the additional changes to the
     auth baton on init that are new in 1.9, but also removes cases where we
     already applied similar changes inside specific ra providers.
   Notes:
     The reason I group this under release blockers, is to avoid the behavior
     change introduced in r1609499 from reaching released versions. The changes
     itself are safe for a later backport as it only affects ra-session
     internal state.
   Votes:
     +1: rhuijben, brane, philip


r1667828 | svn-role | 2015-03-19 13:23:21 -0500 (Thu, 19 Mar 2015)

Merge the r1664476 group from trunk:

 * r1664476, r1664480, r1664481, r1664483, r1664507, r1664520, r1664521, r1664523, r1664526, r1664527, r1665845, r1665850, r1665852
   Automatic create sqlite_stat1 table in wc.db if it doesn't exist.
   Justification:
     Avoid performance regression on some old working copies.
   Notes:
     This stats table provides very valuable hints to the sqlite query
     optimizer. Sqlite 3.8.x needs this for most of our queries.
     .
     See "Manual Control Of Query Plans Using SQLITE_STAT Tables"
     on https://www.sqlite.org/optoverview.html#manctrl
     I (philip) think we cannot release 1.9.0 without this fix.
   Votes:
     +1: philip, rhuijben, ivan, brane


r1667827 | svn-role | 2015-03-19 13:23:13 -0500 (Thu, 19 Mar 2015)

Merge the r1664531 group from trunk:

 * r1664531, r1664532
   Improve database usage in entries-test to speed up test runs
   Justification:
     Use of the non deprecated function to check if the working copy is
     locked avoids re-opening the database for each and every directory.
     This decreases the total time to run the testsuite by > 2%, by just
     reducing the number of db operations.
   Votes:
     +1: rhuijben, philip, brane


r1667826 | svn-role | 2015-03-19 13:23:09 -0500 (Thu, 19 Mar 2015)

Merge the r1665611 group from trunk:

 * r1665611, r1665612
   Improve set of versions of httpd with known encoding issues.
   Justification:
     Prevents spurious test suite failures against older versions of httpd.
   Votes:
     +1: breser, rhuijben, brane


r1667825 | svn-role | 2015-03-19 13:23:06 -0500 (Thu, 19 Mar 2015)

Merge r1665164 from trunk:

 * r1665164
   Fix Python SWIG reference counting in svn_fs_[un]lock_many.
   Justification:
     Python interpreter may crash.
   Votes:
     +1: philip, danielsh


r1667453 | svn-role | 2015-03-17 23:03:17 -0500 (Tue, 17 Mar 2015)

Remove the '1.8.x-r1619380' branch, merged in r1667452.

r1667452 | svn-role | 2015-03-17 23:03:02 -0500 (Tue, 17 Mar 2015)

Merge the 1.8.x-r1619380 branch:

 * r1619380, r1619393, r1660186
   Fix diff of a locally copied directory with props: it showed all props
   as added instead of a diff against the copy-from props.
   Justification:
     Behaviour regression introduced in 1.8.0.
   Notes:
     r1619380 is the fix; r1619393 a test for it.
     The test on trunk@1619393 is tweaked to account for a trunk bug in the
     display of diff headers; the backport branch provides the correct
     version for 1.8.x.
   Branch:
     ^/subversion/branches/1.8.x-r1619380
   Votes:
     +1: rhuijben, brane, stefan2
     +0: julianfoad


r1667451 | svn-role | 2015-03-17 23:02:55 -0500 (Tue, 17 Mar 2015)

Remove the '1.8.x-r1666690' branch, merged in r1667450.

r1667450 | svn-role | 2015-03-17 23:02:40 -0500 (Tue, 17 Mar 2015)

Merge the 1.8.x-r1666690 branch:

 * r1666690
   Record skipped tree during merge on the skip root instead of leaves
   Justification:
     Resolves a user reported problem in merge handling. Avoids unnecessary
     mergeinfo recording on multiple leaves when a single ancestor is shadowed.
   Branch:
     ^/subversion/branches/1.8.x-r1666690
   Votes:
     +1: rhuijben, brane, philip


r1667449 | svn-role | 2015-03-17 23:02:32 -0500 (Tue, 17 Mar 2015)

Remove the '1.8.x-r1660220' branch, merged in r1667448.

r1667448 | svn-role | 2015-03-17 23:02:17 -0500 (Tue, 17 Mar 2015)

Merge the 1.8.x-r1660220 branch:

 * r1660220, r1665874
   Don't leave conflict markers on files that are moved
   Branch:
     ^/subversion/branches/1.8.x-r1660220
   Justification:
     Without this patch property or text conflicted files that are moved
     leave dangling conflict markers in the old location. Easy fix.
   Votes:
     +1: stsp, brane, rhuijben


r1667447 | svn-role | 2015-03-17 23:02:10 -0500 (Tue, 17 Mar 2015)

Remove the '1.8.x-r1664684' branch, merged in r1667446.

r1667446 | svn-role | 2015-03-17 23:01:55 -0500 (Tue, 17 Mar 2015)

Merge the 1.8.x-r1664684 branch:

 * r1664684
   svnrdump: don't provide HEAD+1 as base revision when loading deletes.
   Justification:
     Our own tools should be well behaved.
   Notes:
     A trival merge conflict is fixed on the branch.
   Branch:
     ^/subversion/branches/1.8.x-r1664684
   Votes:
     +1: rhuijben, stsp, brane


r1667445 | svn-role | 2015-03-17 23:01:47 -0500 (Tue, 17 Mar 2015)

Merge r1663991 from trunk:

 * r1663991
   Fix calculating the repository path after commits of nodes that are
   shadowing a switched (not-present) node.
   Justification:
     Allows introducing repository paths in the working copy, that don't
     reflect the repository state.
   Votes:
     +1: rhuijben, stsp, brane


r1667444 | svn-role | 2015-03-17 23:01:44 -0500 (Tue, 17 Mar 2015)

Merge r1660646 from trunk:

 * r1660646
   Fix calculating the repository path of replaced directories on entry upgrade
   Justification:
     Simple fix that avoids recording invalid data in WC-NG.
   Votes:
     +1: rhuijben, stsp, brane


r1667443 | svn-role | 2015-03-17 23:01:40 -0500 (Tue, 17 Mar 2015)

Remove the '1.8.x-r1660593' branch, merged in r1667442.

r1667442 | svn-role | 2015-03-17 23:01:24 -0500 (Tue, 17 Mar 2015)

Merge the 1.8.x-r1660593 branch:

 * ^/subversion/branches/1.8.x-r1660593
   Fix recording last-* information on nodes copied from foreign repositories
   Justification:
     Recording revisions (and other details) of foreign repositories causes
     incorrect status output and bugs when using -rCOMMITTED, -rPREV, etc.
     Local fix.
   Notes:
     The backport includes a small consistency fix from trunk.
   Branch:
     ^/subversion/branches/1.8.x-r1660593
   Votes:
     +1: rhuijben, stsp, brane


r1667441 | svn-role | 2015-03-17 23:01:11 -0500 (Tue, 17 Mar 2015)

Merge r1532287 from trunk:

 * r1532287
   Simplify Windows resource compilation to avoid warnings
   Justification:
     Windows .rc files are compiled with a resource compiler that uses a
     C preprocessor. Our .rc file uses svn_version.h to include the version
     info, but this also brings in a lot of other include files. On newer
     Windows development platforms these header files include macros that
     cause warnings in the resource compilation process. This patch resolves
     all those warnings by including just what is necessary. (This resolves
     multiple warnings for each .dll and .exe on the Windows buildbot,
     thereby hiding more important warnings)
   Votes:
     +1: rhuijben, ivan, brane


r1667440 | svn-role | 2015-03-17 23:01:08 -0500 (Tue, 17 Mar 2015)

Merge r1660071 from trunk:

 * r1660071
   When handling a pre-existing working copy as external, register it as such
   Justification:
     Without this the external is not properly handled as such when performing
     operations like status.
   Votes:
     +1: rhuijben, stsp, brane


r1667439 | svn-role | 2015-03-17 23:01:02 -0500 (Tue, 17 Mar 2015)

Remove the '1.7.x-r1644595' branch, merged in r1667438.

r1667438 | svn-role | 2015-03-17 23:00:47 -0500 (Tue, 17 Mar 2015)

Merge the 1.7.x-r1644595 branch:

 * r1644158, r1644530, r1644595, r1644599, r1652744
   Fix patch output for reordered hunks, part of issue 4533.
   Justification:
     Output is invalid.
   Branch:
     ^/subversion/branches/1.7.x-r1644595
   Votes:
     +1: philip, stefan2, brane


r1667172 | svn-role | 2015-03-16 23:00:42 -0500 (Mon, 16 Mar 2015)

Merge the r1664476 group from trunk:

 * r1664476, r1664480, r1664481, r1664483, r1664507, r1664520, r1664521, r1664523, r1664526, r1664527, r1665845, r1665850, r1665852
   Automatic create sqlite_stat1 table in wc.db if it doesn't exist.
   Justification:
     Avoid performance regression on some old working copies. Same
     fix is nominated for 1.9.0, while this problem also affects older
     versions.
   Notes:
     This stats table provides very valuable hints to the sqlite query
     optimizer. Sqlite 3.8.x needs this for most of our queries.
     .
     See "Manual Control Of Query Plans Using SQLITE_STAT Tables"
     on https://www.sqlite.org/optoverview.html#manctrl
     I (philip) think we cannot release 1.9.0 without this fix.
     .
     For 1.8.x this fix depends on the r1664531, r1664532, r1545134 group.
     The first two revisions avoid a huge testrun delay on Windows,
     while the third revision adds necessary plumbing needed for compilation
     of this group.
   Votes:
     +1: ivan, rhuijben, brane


r1666354 | svn-role | 2015-03-12 23:00:58 -0500 (Thu, 12 Mar 2015)

Merge the r1664531 group from trunk:

 * r1664531, r1664532, r1545134
   Improve database usage in entries-test and svn_wc__db_read_info()
   to speed up test runs and general client speed
   Justification:
     Use of the non deprecated function to check if the working copy is
     locked avoids re-opening the database for each and every directory.
     Introduction of sqlite helper macros eases other backports.
   Votes:
     +1: rhuijben, stsp, ivan


r1666080 | svn-role | 2015-03-11 23:01:32 -0500 (Wed, 11 Mar 2015)

Remove the '1.8.x-r1659867' branch, merged in r1666079.

r1666079 | svn-role | 2015-03-11 23:01:16 -0500 (Wed, 11 Mar 2015)

Merge the 1.8.x-r1659867 branch:

 * ^/subversion/branches/1.8.x-r1659867
   Fix reproducable memory corruption and unneeded io errors on editor abort
   Justification:
     Reproducible double free(), which is undefined behaviour.  Details:
     .
     A SIGPIPE caused by cancelling a commit at the wrong time may cause
     the commit editor to return an error from editor->close_edit() which
     makes most code paths call editor->abort_edit(). But ra-local and ra-serf
     then still tried to access the original transaction which is already
     gone. Daniel Shahaf reported reproducable see double frees when using
     ra-local with fsfs. This fix makes calling abort safe (+- a NO-OP) after
     a successfull commit. A testcase is added showcasing this scenario.
   Notes:
     'svn import -mm | (sleep 2; cat)' followed by ^C at the right time was
     the reproduction.
   Branch:
     ^/subversion/branches/1.8.x-r1659867
   Votes:
     +1: danielsh (without r1660091, r1660097,
                   ra_serf part; looks good but I can't vouch for it)
     +1: philip, rhuijben, stsp


r1666078 | svn-role | 2015-03-11 23:01:07 -0500 (Wed, 11 Mar 2015)

Merge the r1651963 group from trunk:

 * r1651963, r1651966, r1651980, r1651997
   Sequence of moves shouldn't trigger an assertion in the working copy
   Justification:
     Users shouldn't be able to trigger assertions by performing normal
     operations.
   Votes:
     +1: rhuijben, philip, stsp


r1666077 | svn-role | 2015-03-11 23:00:58 -0500 (Wed, 11 Mar 2015)

Remove the '1.8.x-r1573744-and-friends' branch, merged in r1666076.

r1666076 | svn-role | 2015-03-11 23:00:43 -0500 (Wed, 11 Mar 2015)

Merge the 1.8.x-r1573744-and-friends branch:

 * r1561419, r1561427, 1547489, r1560643, r1573744
   Fix the hotcopy and recovery for pre-1.4 FSFS repositories.
   Branch: ^/subversion/branches/1.8.x-r1573744-and-friends
   Justification:
     Without this, old SVN versions won't be able to e.g. hotcopy those
     repos once 1.8.x made a commit in them.  Also, fix our hotcopy code
     and make it cope with repositories broken by previous 1.8.x releases.
   Notes:
     The best way to review this is to review the backporting result in
     r1640603 instead of inspecting the original patches.
     "r1573744" is a bit of a misnomer as only the test case got backported
     because the workflow problem fixed by it does not exist in 1.8.x.
   Votes:
     +1: stefan2, philip, stsp


r1664790 | svn-role | 2015-03-06 22:02:26 -0600 (Fri, 06 Mar 2015)

Remove the '1.7.x-buildfix-neon' branch, merged in r1664789.

r1664789 | svn-role | 2015-03-06 22:02:11 -0600 (Fri, 06 Mar 2015)

Merge the 1.7.x-buildfix-neon branch:

 * ^/subversion/branches/1.7.x-buildfix-neon
   Fix building neon when passing an absolute path to gen-make.py
   Justification:
     Don't create invalid paths in generated project files as those
     will just produce unreadable errors.
     See http://ci.apache.org/builders/svn-windows-local/builds/1617/steps/Build/logs/stdio
     "System.InvalidOperationException: The item metadata "%(FullPath)" cannot be applied
      to the path "D:\local\svn-local\build\D:\local\svn-local\deps\build\neon\neon.vcxproj".
      The given path's format is not supported."
   Branch:
     ^/subversion/branches/1.7.x-buildfix-neon
   Votes:
     +1: rhuijben, stefan2, stsp


r1664788 | svn-role | 2015-03-06 22:01:48 -0600 (Fri, 06 Mar 2015)

Remove the '1.7.x-r1646797' branch, merged in r1664787.

r1664787 | svn-role | 2015-03-06 22:01:32 -0600 (Fri, 06 Mar 2015)

Merge the 1.7.x-r1646797 branch:

 * r1646785, r1646786, r1646797
   Fix a pool handling bug in config variable expansion.
   Justification:
     Using memory after free is undefined behaviour.
   Branch:
     ^/subversion/branches/1.7.x-r1646797
   Votes:
     +1: philip, stefan2, stsp


r1664469 | svn-role | 2015-03-05 13:57:33 -0600 (Thu, 05 Mar 2015)

Merge r1663450 from trunk:

 * r1663450
   Fix removing cache tokens in the ra_svn editor implementation
   Justification:
     Unbounded memory usage and potential access to invalid memory.
   Notes:
     This regression was introduced in r1658194. Reverting this change
     is just as valid as backporting this fix.
   Votes:
     +1: rhuijben, philip, brane
     -0: ivan (prefer r1658194 micro-optimization to be reverted)


r1664463 | svn-role | 2015-03-05 13:40:54 -0600 (Thu, 05 Mar 2015)

Merge the r1664084 group from trunk:

 * r1664084, r1664085
   Reduce memory footprint of svn_repos_deleted_rev().
   Justification:
     Unbounded memory usage. Regression since 1.8.x. Simple fix that keeps
     memory usage limited in a loop.
   Votes:
     +1: rhuijben, ivan, stefan2


r1664462 | svn-role | 2015-03-05 13:40:42 -0600 (Thu, 05 Mar 2015)

Merge the r1663697 group from trunk:

 * r1663697, r1663706, r1663749
   Set svn:date earlier when creating a BDB txn.
   Justification:
     Required for new-in-1.9 svn:client-date to work properly on BDB.
   Notes:
     r1663697 is the fix for this problem, r1663706 and r1663749 add a test.
   Votes:
     +1: philip, rhuijben, kotkov


r1664460 | svn-role | 2015-03-05 13:40:28 -0600 (Thu, 05 Mar 2015)

Merge r1663003 from trunk:

 * r1663003
   info --show-item: Change 'last-changed-rev' to 'last-changed-revision'.
   Justification (for being a freeze exception):
     API change.
   Justification (general):
     Longer-hand spelling is clearer and more self-explanatory.
   Notes:
     API change (can't be merged after 1.9.0).
   Votes:
     +1: danielsh, brane, rhuijben


r1661058 | svn-role | 2015-02-19 22:00:36 -0600 (Thu, 19 Feb 2015)

Merge r1592987 from trunk:

 * r1592987
   Process 'svnadmin dump' output as binary in the test suite.
   Justification:
     The testsuite change in the r1646230 group depends on this fix. Without
     it svnsync_tests.py 23: copy with non-LF line endings in svn:* props
     fails on Windows.
   Votes:
     +1: rhuijben, philip, ivan


r1661057 | svn-role | 2015-02-19 22:00:33 -0600 (Thu, 19 Feb 2015)

Merge r1658417 from trunk:

 * r1658417
   Don't ask a resolver if we should resolve if we only take no as answer
   Justification:
     Presenting conflicts to the conflict resolver only makes sense if the
     result of the function is potentially applied. I'm surprised that
     nobody noticed this problem in svn_wc_resolved_conflict5().
   Votes:
     +1: rhuijben, stefan2, ivan


r1660786 | svn-role | 2015-02-18 22:00:38 -0600 (Wed, 18 Feb 2015)

Merge r1651759 from trunk:

 * r1651759
   Api correctness fix: Duplicate error filename when copying errors
   Justification:
     Simple to fix issue caused error on buildbot.
   Votes:
     +1: rhuijben, philip, stefan2


r1660563 | svn-role | 2015-02-17 22:00:45 -0600 (Tue, 17 Feb 2015)

Remove the '1.8.x-r1590751' branch, merged in r1660562.

r1660562 | svn-role | 2015-02-17 22:00:30 -0600 (Tue, 17 Feb 2015)

Merge the 1.8.x-r1590751 branch:

 * r1590751, r1660350
   Use empty, rather than NULL, config if default is unreadable.
   Justification:
     svn SEGV reported by user.
   Notes:
     A test case is "HOME=/dev/null svn st".
   Branch:
     ^/subversion/branches/1.8.x-r1590751
   Votes:
     +1: rhuijben, philip, julianfoad, danielsh


r1660561 | svn-role | 2015-02-17 22:00:22 -0600 (Tue, 17 Feb 2015)

Merge the r1544302 group from trunk:

 * r1544302, r1544303
   Add HTTPd lock file configuration for testing against HTTPd 2.4+.
   Justification:
     Without this change, the davautocheck tests do not work on some
     systems where HTTPd 2.4+ is the default; OSX 10.10 is one such case.
   Notes:
     As far as I'm concerned, this blocks 1.7.19 and 1.8.11 since the
     tests won't run on a current version of a supported OS.
   Votes:
     +1: brane, breser, philip


r1660269 | svn-role | 2015-02-16 22:00:33 -0600 (Mon, 16 Feb 2015)

[Reverted in r1660335.]

Merge r1590751 from trunk:

 * r1590751
   Use empty, rather than NULL, config if default is unreadable.
   Justification:
     svn SEGV reported by user.
   Votes:
     +1: philip, danielsh, rhuijben
     -0: julianfoad (prefer to fix all the programs at the same time;
                     other queries -- see email thread)
     +1: danielsh (julianf: I agree with your points on list, but +1ing anyway:
                     fixing this segfault in svn need not block on fixing
                     a similar segfault in svnadmin.)


r1660025 | svn-role | 2015-02-15 22:01:48 -0600 (Sun, 15 Feb 2015)

Merge the r1646230 group from trunk:

 * r1646230, r1646250, r1646253, r1656893, r1657182, r1657195, r1657401
   Make svnsync strip any r0 references from mergeinfo -- issue #4476.
   Justification:
     Without this is was not possible to svnsync a repository that contained
     this kind of mergeinfo that is now considered invalid but previously
     could be committed.
   Notes:
     This is also nominated for 1.7.x. The regression test in this group
     depends on the issue #4538 fix in r1646505.
   Votes:
     +1: julianfoad, philip, stefan2


r1660024 | svn-role | 2015-02-15 22:01:44 -0600 (Sun, 15 Feb 2015)

Remove the '1.8.x-issue4411' branch, merged in r1660023.

r1660023 | svn-role | 2015-02-15 22:01:29 -0600 (Sun, 15 Feb 2015)

Merge the 1.8.x-issue4411 branch:

 * r1513479, r1625522 
   Fix issue #4411, 'parent-relative file external can corrupt working copy'.
   Justification:
     Broken working copies are bad.
   Notes:
     This also adds a test case for issue #4519 which was fixed in 1.8.11.
   Branch:
     ^/subversion/branches/1.8.x-issue4411
   Votes:
     +1: stsp, rhuijben, stefan2


r1660022 | svn-role | 2015-02-15 22:01:27 -0600 (Sun, 15 Feb 2015)

Remove the '1.8.x-r1646505' branch, merged in r1660021.

r1660021 | svn-role | 2015-02-15 22:01:11 -0600 (Sun, 15 Feb 2015)

Merge the 1.8.x-r1646505 branch:

 * r1646495, r1646505, r1659801
   Fix issue #4538 'svnadmin load' strips r1 references in mergeinfo
   Justification:
     Fixes a design problem for an uncommon case that is exposed in the
     testcases for issue #4476.
   Branch:
     ^/subversion/branches/1.8.x-r1646505
   Votes:
     +1: julianfoad (without r1659801)
     +1: philip, rhuijben, stefan2


r1660020 | svn-role | 2015-02-15 22:01:04 -0600 (Sun, 15 Feb 2015)

Remove the '1.8.x-issue4551' branch, merged in r1660019.

r1660019 | svn-role | 2015-02-15 22:00:48 -0600 (Sun, 15 Feb 2015)

Merge the 1.8.x-issue4551 branch:

 * r1652182, r1652195, r1652200, r1653622, r1653623, r1653988, r1654039, r1654162, r1654186, r1654271, r1659721
   Fix issue #4551 "svnrdump load commits wrong properties, or fails, on a
   non-deltas dumpfile".
   Justification:
     Data loss.
   Branch: ^/subversion/branches/1.8.x-issue4551
   Notes:
     r1653988, r1654039, r1654271 contain the fixes; the rest are adding tests.
   Votes:
     +1: julianfoad (without r1659721)
     +1: philip, rhuijben, stefan2


r1659882 | svn-role | 2015-02-14 22:01:17 -0600 (Sat, 14 Feb 2015)

Remove the '1.8.x-r1644595' branch, merged in r1659881.

r1659881 | svn-role | 2015-02-14 22:01:02 -0600 (Sat, 14 Feb 2015)

Merge the 1.8.x-r1644595 branch:

 * r1644158, r1644530, r1644595, r1644599, r1652744
   Fix patch output for reordered hunks, part of issue 4533.
   Justification:
     Output is invalid, hunks replace the wrong bits of the file.
   Branch:
     ^/subversion/branches/1.8.x-r1644595
   Votes:
     +1: philip, rhuijben, stefan2


r1659880 | svn-role | 2015-02-14 22:00:59 -0600 (Sat, 14 Feb 2015)

Remove the '1.8.x-r1646797' branch, merged in r1659879.

r1659879 | svn-role | 2015-02-14 22:00:43 -0600 (Sat, 14 Feb 2015)

Merge the 1.8.x-r1646797 branch:

 * r1646785, r1646786, r1646797
   Fix a pool handling bug in config variable expansion.
   Justification:
     Using memory after free is undefined behaviour.
   Branch:
     ^/subversion/branches/1.8.x-r1646797
   Votes:
     +1: philip, rhuijben, stefan2


r1659878 | svn-role | 2015-02-14 22:00:41 -0600 (Sat, 14 Feb 2015)

Merge the r1658115 group from trunk:

 * r1658115, r1659553, r1659554
   Stop dropping a value when copying tree conflict information
   Justification:
     Trivial correctness fix that provides valueable information to the
     conflict resolver.
   Votes:
     +1: rhuijben, ivan, stefan2


r1659877 | svn-role | 2015-02-14 22:00:34 -0600 (Sat, 14 Feb 2015)

Merge r1650531 from trunk, with --accept=tc:

 * r1650531
   Fix a redirect handling bug in 'svn log' over HTTP. 
   Justification:
     Redirects should work.
   Notes:
     Merge with --accept tc
   Votes:
     +1: stsp, philip, stefan2


r1659757 | svn-role | 2015-02-13 22:00:52 -0600 (Fri, 13 Feb 2015)

Remove the '1.8.x-r1643074' branch, merged in r1659756.

r1659756 | svn-role | 2015-02-13 22:00:37 -0600 (Fri, 13 Feb 2015)

Merge the 1.8.x-r1643074 branch:

 * r1643074
   Don't let invalid mergeinfo stop 'svnadmin load' from working.
     Part of issue #4476 "Mergeinfo containing r0 makes svnsync and svnadmin
     dump fail".
   Justification:
     The presence of 'bad' metadata in a repository should not prevent
     backing up and restoring from a backup, given that this data does not
     make the repository totally unusable.
   Notes:
     The 'svnadmin dump' part of this issue was already backported in v1.8.9.
     The 'svnsync' part of this issue is not yet fixed.
   Branch:
     ^/subversion/branches/1.8.x-r1643074
   Votes:
     +1: julianfoad, philip, rhuijben


r1659755 | svn-role | 2015-02-13 22:00:33 -0600 (Fri, 13 Feb 2015)

Merge r1596882 from trunk:

 * r1596882
   Fix build with Ruby 2.
   Justification:
     Move along with the times! And should fix buildbot failures
     according to jamessan, who submitted the patch.
   Votes:
     +1: stsp, rhuijben, philip


r1659754 | svn-role | 2015-02-13 22:00:31 -0600 (Fri, 13 Feb 2015)

Merge r1656713 from trunk:

 * r1656713
   Fix reporting errors from ra_svn's svn_ra_get_dir2() in some cases.
   Justification:
     Causes a connection stall in custom repository browsers that get
     into this code path by not verifying if the directory exists before
     calling this function. Regression against <= 1.7.x.
   Votes:
     +1: rhuijben, ivan, philip


r1659753 | svn-role | 2015-02-13 22:00:29 -0600 (Fri, 13 Feb 2015)

Merge r1659399 from trunk:

 * r1659399
   Make the SQLite build with recent (3.8.x?) amalgamated versions.
   Justification:
     It's a trivial change to catch up with upstream arbitrariness,
     and there's no reason to support a different set of amalgamated
     SQLite versions than library versions.
   Votes:
     +1: brane, ivan, philip, rhuijben


r1659752 | svn-role | 2015-02-13 22:00:28 -0600 (Fri, 13 Feb 2015)

Merge r1651759 from trunk:

 * r1651759
   Api correctness fix: Duplicate error filename when copying errors
   Justification:
     Simple to fix issue caused error on buildbot.
   Votes:
     +1: rhuijben, ivan, philip


r1659751 | svn-role | 2015-02-13 22:00:26 -0600 (Fri, 13 Feb 2015)

Merge the r1659013 group from trunk:

 * r1659013, r1659315
   Fix a race in the DSO initialisation code.
   Justification:
     Fixes occasional SEGV when multiple threads load DSOs in parallel.
   Votes:
     +1: philip, rhuijben, ivan


r1657744 | svn-role | 2015-02-05 22:01:02 -0600 (Thu, 05 Feb 2015)

Remove the '1.8.x-r1611380' branch, merged in r1657743.

r1657743 | svn-role | 2015-02-05 22:00:47 -0600 (Thu, 05 Feb 2015)

Merge the 1.8.x-r1611380 branch:

 * r1611380, r1611381, r1619071, r1647339
   Use simple apr_thread_mutex_t instead of apr_thread_rwlock_t as a workaround
   for performance and consistency problems in APR read/write locks
   implementation on Windows. The APR read/write locks implementation is
   currently known for two long standing problems:
   - Windows and OS/2 rwlock sometimes allows a writer to take the lock while
     a reader has the lock (APR issue 45455)
   - Read-write locks are very slow on Windows due usage of kernel-mode
     CreateMutex instead lightweight criticial section used for apr_mutex_t.
   Justification:
   - In memory cache data corruption in race-condition on Windows
   - 10-15% performance regression since 1.7.x   Discussion:
     Subject: FSFS caching and apr_thread_rwlock_t performance on Windows
     http://svn.haxx.se/dev/archive-2014-12/0112.shtml
   Notes:
     r1611380 contains the fix itself.
     r1611381 and r1619071 are the follow-up commits to fix compilation errors.
     r1647339 fixes error leak introduced in r1611380.
   Branch:
     ^/subversion/branches/1.8.x-r1611380
   Votes:
     +1: ivan, rhuijben, kotkov


r1655931 | svn-role | 2015-01-29 22:00:45 -0600 (Thu, 29 Jan 2015)

Merge r1653039 from trunk:

 * r1653039
   Allocate correct amount of memory for freeze arguments.
   Justification:
     Writing beyond allocated memory is undefined behaviour.
   Votes:
     +1: philip, rhuijben, ivan


r1655930 | svn-role | 2015-01-29 22:00:42 -0600 (Thu, 29 Jan 2015)

Merge r1650834 from trunk:

 * r1650834
   Fix svn_stringbuf_insert and svn_stringbuf_replace when the source is
   within the target stringbuf and contains NUL bytes.
   Justification:
     Result will usually be undefined and the functions may segfault.
   Votes:
     +1: stefan2, rhuijben, ivan


r1655929 | svn-role | 2015-01-29 22:00:37 -0600 (Thu, 29 Jan 2015)

Merge the r1655712 group from trunk:

 * r1655712, r1655738
   Improve error message when external is shadowed by a versioned path.
   Justification:
     The current error message is very unclear.
   Votes:
     +1: brane, rhuijben, stsp


r1651946 | svn-role | 2015-01-14 22:00:33 -0600 (Wed, 14 Jan 2015)

Merge the r1544302 group from trunk:

 * r1544302, r1544303
   Add HTTPd lock file configuration for testing against HTTPd 2.4+.
   Justification:
     Without this change, the davautocheck tests do not work on some
     systems where HTTPd 2.4+ is the default; OSX 10.10 is one such case.
   Notes:
     As far as I'm concerned, this blocks 1.7.19 and 1.8.11 since the
     tests won't run on a current version of a supported OS.
   Votes:
     +1: brane, breser, rhuijben


r1650718 | svn-role | 2015-01-09 22:00:37 -0600 (Fri, 09 Jan 2015)

Merge the r1650481 group from trunk:

 * r1650481, r1650489
   Case-insensitive HTTP header name detection as required by HTTP RFC.
   Justification:
     v2 protocol fails if proxy modifies SVN-Me-Resource to Svn-me-resource.
   Votes:
     +1: philip, rhuijben, stsp


r1643971 | svn-role | 2014-12-08 20:04:07 -0600 (Mon, 08 Dec 2014)

Merge r1643810 from trunk:

 * r1643810
   Avoid unneeded memory growth in mod_dav resource walking (issue 4531)
   Justification:
     Some copy operations failed in certain user scenarios, with really huge
     trees.
   Notes:
     This is working around a mod_dav inefficiency in recent 2.2/2.4.
   Votes:
     +1: rhuijben, stsp, philip


r1643970 | svn-role | 2014-12-08 20:04:05 -0600 (Mon, 08 Dec 2014)

Merge the r1640862 group from trunk:

 * r1640862, r1640873, r1643793
   Work with libtool 2.4.3
   Justification:
     libtool 2.4.3 is needed to build properly on OS X 10.10
   Votes:
     +1: philip, brane, breser


r1643969 | svn-role | 2014-12-08 20:03:36 -0600 (Mon, 08 Dec 2014)

Merge r1643810 from trunk:

 * r1643810
   Avoid unneeded memory growth in mod_dav resource walking (issue 4531)
   Justification:
     Some copy operations failed in certain user scenarios, with really huge
     trees.
   Notes:
     This is working around a mod_dav inefficiency in recent 2.2/2.4.
   Votes:
     +1: rhuijben, stsp, philip


r1643968 | svn-role | 2014-12-08 20:03:34 -0600 (Mon, 08 Dec 2014)

Merge the r1640862 group from trunk:

 * r1640862, r1640873, r1643793
   Work with libtool 2.4.3
   Justification:
     libtool 2.4.3 is needed to build properly on OS X 10.10
   Votes:
     +1: philip, brane, breser


r1643040 | svn-role | 2014-12-02 19:48:43 -0600 (Tue, 02 Dec 2014)

Merge r1637826 from trunk:

 * r1637826
   Fix typos in LIBTOOL_M4 and LIBTOOL_CONFIG expansion in autogen.sh
   Justification:
     Makes no sense to tell users to set environment variables
     to fix builds with libtool in a nonstandard location, if we
     then don't interpret said environment variables correctly.
   Votes:
     +1: brane, stefan2, breser


r1643032 | svn-role | 2014-12-02 19:03:15 -0600 (Tue, 02 Dec 2014)

Merge r1637826 from trunk:

 * r1637826
   Fix typos in LIBTOOL_M4 and LIBTOOL_CONFIG expansion in autogen.sh
   Justification:
     Makes no sense to tell users to set environment variables
     to fix builds with libtool in a nonstandard location, if we
     then don't interpret said environment variables correctly.
   Votes:
     +1: brane, stefan2, breser


r1643031 | svn-role | 2014-12-02 19:03:14 -0600 (Tue, 02 Dec 2014)

Merge r1595431 from trunk:

 * r1595431
   Use a proper intermediate directory when building with VS 2003-2008.
   Justification:
     Reported as a build problem by some of our usual dist signers.
   Votes:
     +1: rhuijben, stefan2, breser


r1643030 | svn-role | 2014-12-02 19:03:09 -0600 (Tue, 02 Dec 2014)

Remove the '1.7.x-r1594157' branch, merged in r1643029.

r1643029 | svn-role | 2014-12-02 19:02:54 -0600 (Tue, 02 Dec 2014)

Merge the 1.7.x-r1594157 branch:

[The branch should have been named '1.7.x-r1594156'.]

 * r1594156
   Fix a problem with the Unix build that could result in linking to the wrong
   Subversion libraries at build time or at run time.
   Justification:
     Building and testing should Just Work as far as possible.
   Branch:
     ^/subversion/branches/1.7.x-r1594157
   Votes:
     +1: julianfoad, stefan2, breser


r1643028 | svn-role | 2014-12-02 19:02:50 -0600 (Tue, 02 Dec 2014)

Remove the '1.7.x-r1227815-conflict' branch, merged in r1643027.

r1643027 | svn-role | 2014-12-02 19:02:34 -0600 (Tue, 02 Dec 2014)

Merge the 1.7.x-r1227815-conflict branch:

 * ^/subversion/branches/1.7.x-r1227815-conflict
   Fix compilation after backporting 1.7.x-r1574868 branch.
   Justification:
     1.7.x shouldn't cause compile errors.
   Branch:
     ^/subversion/branches/1.7.x-r1227815-conflict
   Votes:
     +1: rhuijben, julianfoad, philip


r1642638 | svn-role | 2014-11-30 22:02:13 -0600 (Sun, 30 Nov 2014)

Remove the '1.8.x-r1641564' branch, merged in r1642637.

r1642637 | svn-role | 2014-11-30 22:01:57 -0600 (Sun, 30 Nov 2014)

Merge the 1.8.x-r1641564 branch:

 * r1641564
   Fix issue 4185: file external not following history.
   Justification:
     Checkout/update fails, regression from 1.6.
   Branch:
     ^/subversion/branches/1.8.x-r1641564
   Votes:
     +1: philip, rhuijben, stefan2


r1642636 | svn-role | 2014-11-30 22:01:55 -0600 (Sun, 30 Nov 2014)

Remove the '1.8.x-r1633126' branch, merged in r1642635.

r1642635 | svn-role | 2014-11-30 22:01:39 -0600 (Sun, 30 Nov 2014)

Merge the 1.8.x-r1633126 branch:

 * r1633126
   Improve performance of recorded timestamp fixups in svn cleanup
   Justification:
     Fixing timestamps on a working copy with properly recorded timestamps
     should not cost 10* the time of walking the working copy for status.
   Branch:
     ^/subversion/branches/1.8.x-r1633126
   Votes:
     +1: rhuijben, philip, stefan2


r1642634 | svn-role | 2014-11-30 22:01:36 -0600 (Sun, 30 Nov 2014)

Remove the '1.8.x-r1625533' branch, merged in r1642633.

r1642633 | svn-role | 2014-11-30 22:01:21 -0600 (Sun, 30 Nov 2014)

Merge the 1.8.x-r1625533 branch:

 * r1625533, r1625537
   Keep externals registrations on 'svn upgrade' (part of issue 4519)
   Justification:
     'svn upgrade' shouldn't destroy valid information.
   Branch:
     ^/subversion/branches/1.8.x-r1625533
   Votes:
     +1: rhuijben, philip, stefan2


r1642632 | svn-role | 2014-11-30 22:01:14 -0600 (Sun, 30 Nov 2014)

Remove the '1.7.x-r1641564' branch, merged in r1642631.

r1642631 | svn-role | 2014-11-30 22:00:59 -0600 (Sun, 30 Nov 2014)

Merge the 1.7.x-r1641564 branch:

 * r1641564
   Fix issue 4185: file external not following history.
   Justification:
     Checkout/update fails, regression from 1.6.
   Notes:
     Failure was silent, notification occurred but file was not present in wc.
   Branch:
     ^/subversion/branches/1.7.x-r1641564
   Votes:
     +1: philip, rhuijben, stefan2


r1642630 | svn-role | 2014-11-30 22:00:56 -0600 (Sun, 30 Nov 2014)

Remove the '1.7.x-r1574868' branch, merged in r1642629.

r1642629 | svn-role | 2014-11-30 22:00:40 -0600 (Sun, 30 Nov 2014)

Merge the 1.7.x-r1574868 branch:

 * r1574868
   Don't let invalid mergeinfo stop 'svnadmin dump' from producing a dump.
     Part of issue #4476 "Mergeinfo containing r0 makes svnsync and svnadmin
     dump fail".
   Justification:
     A formatting error in what is essentially client-side metadata, albeit
     with repository-side interpretation as well, should never prevent
     dumping the repository. This issue only occurs when svnadmin is trying
     to warn us of mergeinfo revisions that might be unexpected, so it is
     not essential.
   Notes:
     There is a work-around, at least in theory: a dump starting from
     revision 0 or 1 does not suffer from this problem.
   Branch:
     ^/subversion/branches/1.7.x-r1574868
   Votes:
     +1: julianfoad, rhuijben, stefan2


r1642628 | svn-role | 2014-11-30 22:00:34 -0600 (Sun, 30 Nov 2014)

Merge the r1542610 group from trunk:

 * r1542610, r1564576, r1568180
   Add missing description to build.conf, to properly generate a version
   resource (including icon) for this executable on Windows.
   Votes:
     +1: rhuijben, breser, stefan2


r1642024 | svn-role | 2014-11-26 22:00:42 -0600 (Wed, 26 Nov 2014)

Merge r1640730 from trunk:

 * r1640730
   Use sync Gnome Keyring API as our use of the async is not thread safe.
   Justification:
     Fix issue 3498: eclipse IDE crashes.
   Votes:
     +1: philip, markphip
     +1: rhuijben (unable to test, but fix looks sane and simplifies code)


r1642023 | svn-role | 2014-11-26 22:00:36 -0600 (Wed, 26 Nov 2014)

Merge the r1386594 group from trunk:

 * r1386594, 1386601, 1640730
   Use sync Gnome Keyring API as our use of the async is not thread safe.
    Justification:
      Fix issue 3498: eclipse IDE crashes.
    Notes:
      r1640730 is the fix, r1386594 and r1386601 to avoid conflict.
    Votes:
      +1: philip, markphip
      +1: rhuijben (unable to test, but fix looks sane and simplifies code)


r1641761 | svn-role | 2014-11-25 22:00:34 -0600 (Tue, 25 Nov 2014)

Merge the r1628431 group from trunk:

 * r1628431, r1628536, r1628540
   Fix issue #4085, "external can shadow a versioned directory".
   Justification:
     Bug that can lead to a working copy which cannot be updated
     until a directory shadowing an external, which was switched
     to the external's location by the externals handling code,
     is switched back to its original path.
   Notes:
     r1628536 is the fix, r1628431 and r1628540 correct the test.
   Votes:
     +1: stsp, philip, rhuijben


r1641030 | svn-role | 2014-11-21 22:00:57 -0600 (Fri, 21 Nov 2014)

Remove the '1.7.x-r1462041' branch, merged in r1641029.

r1641029 | svn-role | 2014-11-21 22:00:41 -0600 (Fri, 21 Nov 2014)

Merge the 1.7.x-r1462041 branch:

 * r1462041
   Fix issue issue 4339, diff suffix scanning invalid read at last chunk
   boundary.
   Justification:
     Without this patch we access memory that isn't part of the diff, which
     in some cases causes a segfault.
   Notes:
     This branch only merges the actual fix. Trunk and 1.8.x have a test
     for this case.
   Branch:
     ^/subversion/branches/1.7.x-r1462041
   Votes:
     +1: rhuijben, stsp, philip


r1641028 | svn-role | 2014-11-21 22:00:37 -0600 (Fri, 21 Nov 2014)

Merge r1591123 from trunk:

 * r1591123
   Display the proper URL for 'svn rm URL' in the commit log editor.
   Justification:
     It's confusing since the URL isn't what the user passed.  Regression since
     1.7.9 when we fixed issue #4332.
   Votes:
     +1: breser, rhuijben, julianfoad


r1640852 | svn-role | 2014-11-20 22:01:05 -0600 (Thu, 20 Nov 2014)

Remove the '1.8.x-r1621978' branch, merged in r1640851.

r1640851 | svn-role | 2014-11-20 22:00:49 -0600 (Thu, 20 Nov 2014)

Merge the 1.8.x-r1621978 branch:

 * r1621978, r1621981
   Fix changelist filtering for repos-WC and WC-WC diffs.
   Justification:
     Changelist filtering, enabled by "svn diff --cl foo" for example, was
     broken (it crashed in common cases) and incomplete even if the crash
     were avoided. See email thread "Segmentation fault during diff generation"
     starting at <http://svn.haxx.se/dev/archive-2014-08/0325.shtml>.
   Branch:
     ^/subversion/branches/1.8.x-r1621978
   Votes:
     +1: julianfoad, rhuijben, philip


r1640666 | svn-role | 2014-11-19 22:01:39 -0600 (Wed, 19 Nov 2014)

Remove the '1.8.x-r1611379' branch, merged in r1640665.

r1640665 | svn-role | 2014-11-19 22:01:23 -0600 (Wed, 19 Nov 2014)

Merge the 1.8.x-r1611379 branch:

 * r1619380, r1619393
   Fix diff of a locally copied directory with props: it showed all props
   as added instead of a diff against the copy-from props.
   Justification:
     Behaviour regression introduced in 1.8.0.
   Notes:
     r1619380 is the fix; r1619393 a test for it.
     The test on trunk@1619393 is tweaked to account for a trunk bug in the
     display of diff headers; the backport branch provides the correct
     version for 1.8.x.
   Branch:
     ^/subversion/branches/1.8.x-r1611379
   Votes:
     +1: julianfoad, rhuijben, stefan2


r1640664 | svn-role | 2014-11-19 22:01:21 -0600 (Wed, 19 Nov 2014)

Remove the '1.8.x-gpg-agent' branch, merged in r1640663.

r1640663 | svn-role | 2014-11-19 22:01:05 -0600 (Wed, 19 Nov 2014)

Merge the 1.8.x-gpg-agent branch:

 * r1600331, r1600348, 1600368, r1600563, r1600781
   Improve gpg-agent support.
   Justification: Avoids spurious error logs, supports standard socket
     locations and removes double prompts from pinentry.  Without these
     changes it's far less desireable to use.
   Notes:
     Branch is needed since SVN_VA_NULL is not available in 1.8.x.
     This does change the behavior of gpg-agent from prompting twice
     for the password with pinentry to confirm the user hasn't entered
     an incorrect password to instead clearing bad cached passwords and
     reprompting.  See my email on the subject: https://mail-archives.apache.org/mod_mbox/subversion-dev/201406.mbox/%3C538D2BE5.3070706%40reser.org%3E
   Branch:
     ^/subversion/branches/1.8.x-gpg-agent
   Votes:
     +1: breser, philip, stefan2


r1640662 | svn-role | 2014-11-19 22:01:03 -0600 (Wed, 19 Nov 2014)

Merge the r1542610 group from trunk:

 * r1542610, r1564576, r1568180
   Add missing description to build.conf, to properly generate a version
   resource (including icon) for this executable on Windows.
   Notes:
     r1564576 breaks compilation on Visual Studio 2010, 2012 and 2013 of
     this project. r1568180 fixes this problem.
   Votes:
     +1: rhuijben, breser, stefan2
     +1: (without r1564576, r1568180): stsp


r1640661 | svn-role | 2014-11-19 22:01:01 -0600 (Wed, 19 Nov 2014)

Merge r1620332 from trunk, with --accept=theirs-conflict:

 * r1620332
   Remove broken conflict resolver menu options.
   Justification:
     svn shouldn't offer menu options that always error out.
   Notes:
     Run merge with --accept theirs-conflict
   Votes:
     +1: stsp, julianfoad, stefan2


r1640660 | svn-role | 2014-11-19 22:00:58 -0600 (Wed, 19 Nov 2014)

Remove the '1.8.x-r1589360' branch, merged in r1640659.

r1640659 | svn-role | 2014-11-19 22:00:42 -0600 (Wed, 19 Nov 2014)

Merge the 1.8.x-r1589360 branch:

 * r1589360
   Make property output in 'svn diff' stable
   Justification:
     Local change that makes it easier to compare patch files.
   Branch:
     ^/subversion/branches/1.8.x-r1589360
   Votes:
     +1: ivan, rhuijben, stefan2


r1640483 | svn-role | 2014-11-18 22:01:02 -0600 (Tue, 18 Nov 2014)

Merge r1636874 from trunk:

 * r1636874
   Provide @since information in svn_stream_skip docstring.
   Justification:
     Our API docs should be accurate.
   Votes:
     +1: stefan2, julianfoad, rhuijben


r1640482 | svn-role | 2014-11-18 22:00:59 -0600 (Tue, 18 Nov 2014)

Remove the '1.8.x-r1561426' branch, merged in r1640481.

r1640481 | svn-role | 2014-11-18 22:00:44 -0600 (Tue, 18 Nov 2014)

Merge the 1.8.x-r1561426 branch:

 * r1561426
   In FSFS, skip the generation of uniquifiers if rep-shared is not supported.
   Branch: ^/subversion/branches/1.8.x-r1561426
   Justification:
     This is not known to be a bug, atm, as we omit these when we write the
     final revisions.  But we rely on those uniquifiers to be NULL in old
     repo formats when we compare reps.  Them being non-NULL in a txn might
     cause problems with future changes.
   Votes:
     +1: stefan2, breser, rhuijben


r1640480 | svn-role | 2014-11-18 22:00:41 -0600 (Tue, 18 Nov 2014)

Remove the '1.8.x-r1619774' branch, merged in r1640479.

r1640479 | svn-role | 2014-11-18 22:00:25 -0600 (Tue, 18 Nov 2014)

Merge the 1.8.x-r1619774 branch:

 * r1543594, r1619774, r1619105, r1619118, r1619153, r1619802
   Disable the revprop caching feature.
   Justification:
     The deployment restrictions that come with the 1.8 implementation
     of this feature make it hard to use correctly. See also
     http://svn.haxx.se/dev/archive-2014-08/0273.shtml
   Notes:
     r1619774 is the actual patch, r1543594 is a whitespace only change
     that prevents a text conflict.  r1619105, r1619118, r1619153 and
     r1619802 provide a new test case.  This required the backport branch
     since the test file has been renamed on /trunk and used 1.9 APIs.
   Branch:
     ^/subversion/branches/1.8.x-r1619774
   Votes:
     +1: stefan2, ivan, rhuijben


r1640478 | svn-role | 2014-11-18 22:00:20 -0600 (Tue, 18 Nov 2014)

Merge r1636874 from trunk:

 * r1636874
   Provide @since information in svn_stream_skip docstring.
   Justification:
     Our API docs should be accurate.
   Votes:
     +1: stefan2, julianfoad


r1617871 | svn-role | 2014-08-13 23:00:06 -0500 (Wed, 13 Aug 2014)

Merge the r1592014 group from trunk:

 * r1592014, r1592034
   Fix 'svn patch' skipping targets in valid --git diffs.
   Justification:
     'svn patch' should parse --git diffs correctly. User complained.
     See http://svn.haxx.se/users/archive-2014-05/0003.shtml and replies.
   Votes:
     +1: stsp, breser, rhuijben


r1617870 | svn-role | 2014-08-13 23:00:04 -0500 (Wed, 13 Aug 2014)

Merge r1612225 from trunk:

 * r1612225
   Ignore ENOTIMPL and EINCOMPLETE errors when tweaking temporary file
   permission bits on non-windows systems.
   Justification:
     These errors imply the underlying filesystem doesn't support
     permissions. svn_io_copy_perms handles these errors in the
     same way.
   Votes:
     +1: stsp, breser, rhuijben


r1616396 | svn-role | 2014-08-06 23:00:03 -0500 (Wed, 06 Aug 2014)

Merge r1616131 from trunk:

 * r1616131
   Make sure all members of the repos layer notify struct are valid by no
   longer re-using a single instance.
   Justification:
     This resolves segfaults in bindings like javahil that use all members
     of the struct, instead of only those needed for output (as svnadmin).
   Votes:
     +1: rhuijben, stsp, brane


r1615221 | svn-role | 2014-08-01 15:28:59 -0500 (Fri, 01 Aug 2014)

Remove the '1.7.x-disable_zlib_asm' branch, merged in r1615220.

r1615220 | svn-role | 2014-08-01 15:28:43 -0500 (Fri, 01 Aug 2014)

Merge the 1.7.x-disable_zlib_asm branch:

 * ^/subversion/branches/1.7.x-disable_zlib_asm
   Disable building ZLib's assembly optimizations on Windows
   Justification:
     Without this patch some users might accidentally make Subversion build
     zlib with known issues which would break ra_serf against older serf
     versions. (With newer serf versions the user would have to build zlib
     himself before building Subversion)
   Branch:
     ^/subversion/branches/1.7.x-disable_zlib_asm
   Votes:
     +1: rhuijben, ivan, breser


r1615204 | svn-role | 2014-08-01 13:59:36 -0500 (Fri, 01 Aug 2014)

Merge the r1565531 group from trunk:

 * r1565531, r1566503, r1568349, r1568361
   Ignore the CommonName in SSL certs when there are Subject Alt Names.
   Justification:
     Comply with RFC 2818.
   Votes:
     +1: breser, stefan2, ivan


r1615203 | svn-role | 2014-08-01 13:59:34 -0500 (Fri, 01 Aug 2014)

Merge the r1547454 group from trunk:

 * r1547454, r1561703
   In FSFS, omit config file when creating pre-1.5 format repositories.
   Justification:
     Old SVN versions won't preserve this file in hotcopy.  Later versions
     might also behave inconsistently in the presence of this file if their
     feature availability check is incomplete.
   Votes:
     +1: stefan2, breser, ivan


r1615202 | svn-role | 2014-08-01 13:59:32 -0500 (Fri, 01 Aug 2014)

Merge r1606009 from trunk:

 * r1606009
   Allocate hash values in hash pool to avoid lifetime issue.
   Justification:
     Avoids use-after-clear (on trunk) detected by valgrind.
   Notes:
     Fix is logically correct but not really needed at present.
   Votes:
     +1: philip, rhuijben, breser


r1615201 | svn-role | 2014-08-01 13:59:30 -0500 (Fri, 01 Aug 2014)

Remove the '1.8.x-VS2013-14' branch, merged in r1615200.

r1615200 | svn-role | 2014-08-01 13:59:15 -0500 (Fri, 01 Aug 2014)

Merge the 1.8.x-VS2013-14 branch:

 * ^/subversion/branches/1.8.x-VS2013-14
   Enable support for generating VS2013 and later ("14"+) project files.
   Justification:
     This makes it possible to build with recent Visual Studio versions
     without local patches.
   Branch:
     ^/subversion/branches/1.8.x-VS2013-14
   Votes:
     +1: rhuijben, ivan, breser


r1615199 | svn-role | 2014-08-01 13:59:12 -0500 (Fri, 01 Aug 2014)

Remove the '1.8.x-rm-external-dir' branch, merged in r1615198.

r1615198 | svn-role | 2014-08-01 13:58:57 -0500 (Fri, 01 Aug 2014)

Merge the 1.8.x-rm-external-dir branch:

 * r1600311, r1600315, r1600323, r1600393
   Properly delete ancestor directories of externals when removing the
   external by changing the svn:externals value.
   Justification:
     Regression against 1.7.x
   Branch:
     ^/subversion/branches/1.8.x-rm-external-dir
   Votes:
     +1: rhuijben, philip, breser


r1615197 | svn-role | 2014-08-01 13:58:55 -0500 (Fri, 01 Aug 2014)

Merge r1595431 from trunk:

 * r1595431
   Use a proper intermediate directory when building with VS 2003-2008.
   Justification:
     Reported as a build problem by some of our usual dist signers.
   Votes:
     +1: rhuijben, ivan, breser


r1615196 | svn-role | 2014-08-01 13:58:54 -0500 (Fri, 01 Aug 2014)

Merge the r1589460 group from trunk:

 * r1589460, r1589486
   Fix copying parents of locally deleted nodes between working copies.
   Justification:
     Resolves a case of creating invalid working copy state.
   Votes:
     +1: rhuijben, philip, breser


r1615195 | svn-role | 2014-08-01 13:58:52 -0500 (Fri, 01 Aug 2014)

Merge the r1589184 group from trunk:

 * r1589184, r1589188
   Properly handle properties not present and excluded on cross wc copy
   Justification:
     Cross working copy copies should just work.
   Votes:
     +1: rhuijben, philip, breser


r1615194 | svn-role | 2014-08-01 13:58:49 -0500 (Fri, 01 Aug 2014)

Remove the '1.7.x-md5-collision' branch, merged in r1615193.

r1615193 | svn-role | 2014-08-01 13:58:34 -0500 (Fri, 01 Aug 2014)

Merge the 1.7.x-md5-collision branch:

 * r1550691, r1550772, r1600909
   Guard against MD5 hash collisions when finding cached credentials.
   Justification:
     MD5 collision attacks exist and could be used to trick a client into
     sending cached credentials to a server other than what they were
     cached for.
   Notes:
     Branch is required due to svn_hash_gets() not being available in 1.7.x
   Branch:
     ^/subversion/branches/1.7.x-md5-collision
   Votes:
     +1: breser, stefan2, philip


r1609004 | svn-role | 2014-07-08 23:00:20 -0500 (Tue, 08 Jul 2014)

Merge r1594156 from trunk:

 * r1594156
   Fix a problem with the Unix build that could result in linking to the wrong
   Subversion libraries at build time or at run time.
   Justification:
     Building and testing should Just Work as far as possible.
   Votes:
     +1: julianfoad, philip, rhuijben


r1609003 | svn-role | 2014-07-08 23:00:17 -0500 (Tue, 08 Jul 2014)

Merge the r1594794 group from trunk:

 * r1594794, r1594814, r1594834, r1595061
   Fix the notify_func callbacks in Python bindings.
   Justification:
     Slightly broken implementation made them impossible to use.
   Votes:
     +1: breser, philip
     +0: rhuijben


r1609002 | svn-role | 2014-07-08 23:00:15 -0500 (Tue, 08 Jul 2014)

Merge r1596866 from trunk:

 * r1596866
   Fix another instance of issue #3014, "svn log | head" should not
   print "Write error: Broken pipe"
   Justification:
     Minor annoyance, already fixed for other cases.
   Votes:
     +1: stsp, ivan, philip


r1609001 | svn-role | 2014-07-08 23:00:12 -0500 (Tue, 08 Jul 2014)

Merge r1593992 from trunk:

 * r1593992
   Remove useless warning about ruby during configure.
   Justification:
     Ruby 1.9 support has been there for a while.  Telling people iff they
     are using Ruby 1.9.3 that the support is new is useless.
   Votes:
     +1: breser, rhuijben, philip


r1609000 | svn-role | 2014-07-08 23:00:10 -0500 (Tue, 08 Jul 2014)

Merge r1591123 from trunk:

 * r1591123
   Display the proper URL for 'svn rm URL' in the commit log editor.
   Justification:
     It's confusing since the URL isn't what the user passed.  Regression since
     1.7.9 when we fixed issue #4332.
   Votes:
     +1: breser, rhuijben, philip


r1606977 | svn-role | 2014-06-30 23:00:27 -0500 (Mon, 30 Jun 2014)

Remove the '1.8.x-r1594223' branch, merged in r1606976.

r1606976 | svn-role | 2014-06-30 23:00:11 -0500 (Mon, 30 Jun 2014)

Merge the 1.8.x-r1594223 branch:

 * r1594223, r1553501, r1553556, r1559197
   Fix a URI-escaping bug in ra_serf and add a regression test for it.
   Justification:
     Committing a deletion of a locked path should work.
   Notes:
     As a nice side effect the behavior change of this patch also resolves
     Issue #3674: Replace + propset of locked file fails over DAV, and avoids
     some duplicated requests by providing better lock information during
     commit.
   Branch:
     ^/subversion/branches/1.8.x-r1594223
   Votes:
     +1: stsp, rhuijben, ivan


r1605944 | svn-role | 2014-06-26 23:00:07 -0500 (Thu, 26 Jun 2014)

Merge the r1550691 group from trunk:

 * r1550691, r1550772, r1600909
   Guard against MD5 hash collisions when finding cached credentials.
   Justification:
     MD5 collision attacks exist and could be used to trick a client into
     sending cached credentials to a server other than what they were
     cached for.
   Votes:
     +1: breser, danielsh, rhuijben


r1605567 | svn-role | 2014-06-25 14:32:34 -0500 (Wed, 25 Jun 2014)

Merge the r1496127 group from trunk:

 * r1496127, r1567492, r1567494
   Fix occasional failure of checkout_tests.py 12 due to dropping the
   fractional seconds from the current time.
   Justification:
     Spurious FAILs confuse people testing the release.
     This group was back-ported to 1.8.x in http://svn.apache.org/r1567731 .
   Votes:
     +1: julianfoad, danielsh, rhuijben


r1589579 | svn-role | 2014-04-23 23:02:27 -0500 (Wed, 23 Apr 2014)

Merge the r1573106 group from trunk:

 * r1573106, r1573209
   A more stringent test for whether the compiler accepts a given option.
   Justification:
     Makes --enable-optimize and --enable-debug work with Solaris CC.
   Votes:
     +1: philip, rhuijben, stefan2


r1589578 | svn-role | 2014-04-23 23:02:24 -0500 (Wed, 23 Apr 2014)

Remove the '1.8.x-r1578311' branch, merged in r1589573.

r1589577 | svn-role | 2014-04-23 23:02:09 -0500 (Wed, 23 Apr 2014)

Merge the 1.8.x-r1578311 branch:

 * r1578273, r1578311, r1578326
   Make svn_ra_get_locks() and svn_ra_get_lock() report not locked nodes
   with a NULL svn_lock_t *, as documented.
   Justification:
     Many clients use the existence of an svn_lock_t on a node via info/status
     as a boolean to note that there is a lock. But because we didn't properly
     check the result we reported mostly empty svn_lock_t instances in more
     cases. Even on directories!
   Notes:
     A branch is needed, because the serf lock handling code was refactored and
     split to multiple files on trunk.
   Branch:
     ^/subversion/branches/1.8.x-r1578311
   Votes:
     +1: rhuijben, philip, stefan2


r1589576 | svn-role | 2014-04-23 23:02:06 -0500 (Wed, 23 Apr 2014)

Remove the '1.8.x-r1577151' branch, merged in r1589573.

r1589575 | svn-role | 2014-04-23 23:01:49 -0500 (Wed, 23 Apr 2014)

Merge the 1.8.x-r1577151 branch:

 * r1577151
   Make 'svn merge' honor the 'preserved-conflict-file-exts' setting.
   Justification:
     While really a behavior change that doesn't belong in a patch release
     I'm guessing nobody knew that we didn't implement this flag in this
     scenario.
   Branch:
     ^/subversion/branches/1.8.x-r1577151
   Votes:
     +1: rhuijben, steveking, stefan2


r1589574 | svn-role | 2014-04-23 23:01:47 -0500 (Wed, 23 Apr 2014)

Remove the '1.8.x-r1584342' branch, merged in r1589573.

r1589573 | svn-role | 2014-04-23 23:01:31 -0500 (Wed, 23 Apr 2014)

Merge the 1.8.x-r1584342 branch:

 * r1581810, 1584342
   Fix issue 4412, locks lost from working copy with pre-1.6.17 servers.
   Justification:
     Regression from 1.7, makes using locks hard.
   Notes:
     r1584342 is the fix, r1581810 is a test that fails with a 1.6.16 server.
   Branch:
     ^/subversion/branches/1.8.x-r1584342
    (merge before ^/subversion/branches/1.8.x-r1584592)
   Votes:
     +1: philip, rhuijben, stefan2


r1589572 | svn-role | 2014-04-23 23:01:28 -0500 (Wed, 23 Apr 2014)

Remove the '1.8.x-apr-0.9' branch, merged in r1589571.

r1589571 | svn-role | 2014-04-23 23:01:12 -0500 (Wed, 23 Apr 2014)

Merge the 1.8.x-apr-0.9 branch:

 * 1585499
   Build with apr-0.9.x.
   Justification:
     1.8 claims 0.9 support but it doesn't work.
   Branch:
     ^/subversion/branches/1.8.x-apr-0.9
   Votes:
     +1: philip, rhuijben, stefan2


r1589570 | svn-role | 2014-04-23 23:01:09 -0500 (Wed, 23 Apr 2014)

Merge r1587968 from trunk:

 * r1587968
   Maintain data[len]=0 invariant for svn_string_t.
   Justification:
     Code may rely on null byte being present.
   Notes:
     Triggers a read beyond allocated memory on trunk but no known
     misbehaviour on 1.8.
   Votes:
     +1: philip, rhuijben, stefan2


r1589569 | svn-role | 2014-04-23 23:01:08 -0500 (Wed, 23 Apr 2014)

Merge the r1545835 group from trunk:

 * r1545835, r1545845
   Prevent use with known buggy versions of httpd.
   Justification:
     Signal to our packagers that these versions have issues that they either
     need to upgrade or patch around.
   Votes:
     +1: breser, rhuijben, danielsh


r1589568 | svn-role | 2014-04-23 23:01:05 -0500 (Wed, 23 Apr 2014)

Remove the '1.7.x-r1551579' branch, merged in r1589565.

r1589567 | svn-role | 2014-04-23 23:00:49 -0500 (Wed, 23 Apr 2014)

Merge the 1.7.x-r1551579 branch:

 * ^/subversion/branches/1.7.x-r1551579
   Fix moving files from externals to ancestor directories and vice versa.
   Justification:
     "Moves should just work" or "be nice to api users, like Markus"
   Votes:
     +1: rhuijben, breser, stefan2
     +1 (non-binding): schabi (Fixes our use case, all our other tests pass.)


r1589566 | svn-role | 2014-04-23 23:00:46 -0500 (Wed, 23 Apr 2014)

Remove the '1.7.x-serf-1.3.x-Windows' branch, merged in r1589565.

r1589565 | svn-role | 2014-04-23 23:00:29 -0500 (Wed, 23 Apr 2014)

Merge the 1.7.x-serf-1.3.x-Windows branch:

 * ^/subversion/branches/1.7.x-serf-1.3.x-Windows
   Allow compiling against Serf 1.3.x
   Notes:
     Backport of the 1.8 fixes, plus a few more fixes in order not to
     break the neon compilation which also hooks into zlib.
   Justification:
     (Without this patch the Windows buildbot remains broken for serf with 1.7,
      as recent Subversion versions require serf 1.3.x)
   Votes:
     +1: rhuijben, jcorvel, stefan2


r1589564 | svn-role | 2014-04-23 23:00:27 -0500 (Wed, 23 Apr 2014)

Merge r1587968 from trunk, with --accept=mine-conflict:

 * r1587968
   Maintain data[len]=0 invariant for svn_string_t.
   Justification:
     Code may rely on null byte being present.
   Notes:
     Triggers a read beyond allocated memory on trunk but no known
     misbehaviour on 1.7.
     Merge with --accept=mine-conflict.
   Votes:
     +1: philip, rhuijben, stefan2


r1589563 | svn-role | 2014-04-23 23:00:26 -0500 (Wed, 23 Apr 2014)

Merge r1577200 from trunk:

 * r1577200
   Fix libmagic detection with custom LDFLAGS.
   Justification:
     Fixes libmagic detection where configure relies on LDFLAGS
     to find libraries in non-standard locations.
     This should allow the bb-openbsd buildbot to compile 1.7.x.
   Votes:
    +1: stsp, rhuijben, stefan2


r1589335 | svn-role | 2014-04-22 23:00:43 -0500 (Tue, 22 Apr 2014)

Remove the '1.7.x-javahl-exception-crash' branch, merged in r1589334.

r1589334 | svn-role | 2014-04-22 23:00:27 -0500 (Tue, 22 Apr 2014)

Merge the 1.7.x-javahl-exception-crash branch:

 * r1586439
   Fix a crash in JavaHL that was reported on the users@ list and is
   already fixed on trunk.
   Justification:
     JavaHL should not crash the JVM too often.
   Notes:
     The original report is here:
     http://mail-archives.apache.org/mod_mbox/subversion-users/201404.mbox/%3CCAAVTFFjrZEy-PT3i1xu0mOM_AC89-237CmFEZ7QYcJxNckfEtA%40mail.gmail.com%3E
   Branch:
     ^/subversion/branches/1.7.x-javahl-exception-crash
   Votes:
     +1: brane, rhuijben


r1588153 | svn-role | 2014-04-17 02:47:00 -0500 (Thu, 17 Apr 2014)

Merge the r1586052 group from trunk:

 * r1586052, r1586467
   Fix two memory lifetime bugs in the Ruby bindings.
   Justification:
     Ruby bindings tests crash with APR pool debugging enabled.
   Votes:
     +1: stsp
     +0: rhuijben (Looks good. Can't test)
sentinel


r1588152 | svn-role | 2014-04-17 02:46:42 -0500 (Thu, 17 Apr 2014)

Merge the 1.8.x-javahl-exception-crash branch:

 * r1586439
   Fix a crash in JavaHL that was reported on the users@ list and is
   already fixed on trunk.
   Justification:
     JavaHL should not crash the JVM too often.
   Notes:
     The original report is here:
     http://mail-archives.apache.org/mod_mbox/subversion-users/201404.mbox/%3CCAAVTFFjrZEy-PT3i1xu0mOM_AC89-237CmFEZ7QYcJxNckfEtA%40mail.gmail.com%3E
   Branch:
     ^/subversion/branches/1.8.x-javahl-exception-crash
   Votes:
     +1: brane, rhuijben


r1588151 | svn-role | 2014-04-17 02:46:39 -0500 (Thu, 17 Apr 2014)

Merge r1587946 from trunk:

 * r1587946
   Fix variable usage after it is out of scope.
   Justification:
     While not reported by users, this might cause hard to diagnose segfaults.
   Votes:
     +1: rhuijben, philip, steveking


r1588150 | svn-role | 2014-04-17 02:46:37 -0500 (Thu, 17 Apr 2014)

Merge the r1578670 group from trunk:

 * r1578670, r1578820, r1579274, r1587511
   Fix the order of node record headers written by svndumpfilter.
   Justification:
     Makes output match the rules documented in notes/dump-load-format.txt.
   Votes:
     +1: philip, julianfoad, rhuijben


r1588149 | svn-role | 2014-04-17 02:46:34 -0500 (Thu, 17 Apr 2014)

Merge the r1570642 group from trunk, with --accept=working:

 * r1570642, r1585686, r1586352
   Fix memcached support.
   Justification:
     Enabling memcached causes crashes without these fixes.
     Regression from 1.7.
   Notes:
     Merge with --accept=working to resolve FSX conflict.
   Votes:
     +1: stsp, philip, julianfoad


r1588148 | svn-role | 2014-04-17 02:46:31 -0500 (Thu, 17 Apr 2014)

Merge r1580832 from trunk:

 * r1580832
   Resolve 'svnrdump load' segfault deleting an 'svn:*' property (issue #4490)
   Justification:
     Simple fix for a segfault
   Notes:
     r1586668 on trunk is a regression test for this fix. Normally we'd
     backport a regression test along with a fix but others have already
     voted for the fix without it, so, as it's simple, I'm not bothering to
     do so this time.
   Votes:
     +1: rhuijben, ivan, julianfoad


r1588147 | svn-role | 2014-04-17 02:46:29 -0500 (Thu, 17 Apr 2014)

Merge r1577294 from trunk:

 * r1577294
   Make interactive conflict resolver behave as designed.
   Justification:
     This was intended to be the behavior form the start.  A typo in a
     refactoring broke it.  This fix helps users avoid accidentally choosing
     'mark resolved' and committing conflict markers.
   Votes:
     +1: breser, ivan, julianfoad


r1588146 | svn-role | 2014-04-17 02:46:11 -0500 (Thu, 17 Apr 2014)

Merge the 1.8.x-r1577812 branch:

 * r1577812, r1577813, r1579429
   Resolve a segfault when 'svn merge --force' merges a directory delete
   Justification:
     Even though this merge flag is not recommended, it shouldn't cause a
     segfault.
   Notes:
     r1577812 contains the actual fix and a regression test. r1577813 is
     a minor improvement. A branch is necessary because a comment right above
     the fix contained a typo that was fixed on trunk in a huge commit of many
     typo fixes.
   Branch:
     ^/subversion/branches/1.8.x-r1577812
   Votes:
     +1: philip, rhuijben, julianfoad


r1588145 | svn-role | 2014-04-17 02:46:08 -0500 (Thu, 17 Apr 2014)

Merge the r1571747 group from trunk:

 * r1571747, r1571787, r1571795
   Resolve the 'commit_util.c' (repos_root_url && repos_relpath) assertion.
   Notes:
     This assertion is raised when specifically committing a deleted
     descendant, like via a checkbox list in a GUI client.
   Justification:
     Often reported assertion by users. Upto now very hard to reproduce
     for these users. Probably because they didn't see that the node they
     deleted wasn't added to the repository yet.
   Votes:
     +1: rhuijben, philip, steveking


r1586558 | svn-role | 2014-04-10 23:01:36 -0500 (Thu, 10 Apr 2014)

Merge r1481782 from trunk:

 * r1481782
   Fix problem in test suite by allocating buffer of the right size
   Justification:
     Reported to fail often when tracing memory problems.
   Votes:
     +1: rhuijben, stsp, philip


r1586557 | svn-role | 2014-04-10 23:01:34 -0500 (Thu, 10 Apr 2014)

Merge r1586255 from trunk:

 * r1586255
   Fix propget/proplist error on invalid revisions
   Justification:
     Replaces easy to trigger assertions with proper errors.
   Votes:
     +1: rhuijben, julianfoad, philip


r1586556 | svn-role | 2014-04-10 23:01:33 -0500 (Thu, 10 Apr 2014)

Merge r1583580 from trunk:

 * r1583580
   Skip a test that fails when run as root.
   Justification:
     Avoids spurious FAIL.
   Votes:
     +1: philip, rhuijben, julianfoad


r1586555 | svn-role | 2014-04-10 23:01:31 -0500 (Thu, 10 Apr 2014)

Merge the r1579684 group from trunk:

 * r1579684, r1580867, r1580872
   Fix issue #4481 "automatic merge confused by missing subtree merge".
   Justification:
     Valid merges were broken (and gave a confusing error message).
   Votes:
     +1: julianfoad, rhuijben, philip


r1585644 | svn-role | 2014-04-07 23:01:37 -0500 (Mon, 07 Apr 2014)

Merge r1583977 from trunk:

 * r1583977
   Do not leave dead transaction if commit was blocked by start-commit hook.
   Justification:
     Leaving dead transaction is not good thing. Regression from 1.7.
   Votes:
     +1: ivan, rhuijben, kotkov


r1585643 | svn-role | 2014-04-07 23:01:36 -0500 (Mon, 07 Apr 2014)

Merge r1581296 from trunk:

 * r1581296
   Reduce buffer size used for parsing config files. There no reason to waste 
   100kb of memory -- 16kb is enough to avoid I/O overhead.
   Justification:
     Significantly reduce server memory footprint on high load.
   Votes:
     +1: ivan, rhuijben, kotkov


r1582591 | svn-role | 2014-03-27 23:01:19 -0500 (Thu, 27 Mar 2014)

Merge r1577200 from trunk:

 * r1577200
   Fix libmagic detection with custom LDFLAGS.
   Justification:
     Fixes libmagic detection where configure relies on LDFLAGS
     to find libraries in non-standard locations.
     This should allow the bb-openbsd buildbot to compile 1.8.x.
   Votes:
     +1: stsp, rhuijben, philip


r1582590 | svn-role | 2014-03-27 23:01:18 -0500 (Thu, 27 Mar 2014)

Merge r1555403 from trunk:

 * r1555403
   Update copyright years in NOTICE and subversion/libsvn_subr/version.c.
   Justification:
     We're not in 2013 any more.
   Votes:
     +1: brane, ivan, rhuijben


r1582589 | svn-role | 2014-03-27 23:01:15 -0500 (Thu, 27 Mar 2014)

Remove the '1.8.x-r1581305' branch, merged in r1582588.

r1582588 | svn-role | 2014-03-27 23:00:59 -0500 (Thu, 27 Mar 2014)

Merge the 1.8.x-r1581305 branch:

 * r1581305, r1581315
   Increase timestamp sleep from 1ms to 10ms for hi-res filesystems.
   Justification:
     Missed text changes on some Linux systems.
   Branch:
     ^/subversion/branches/1.8.x-r1581305
   Votes:
     +1: philip, rhuijben, ivan


r1581684 | svn-role | 2014-03-25 23:01:12 -0500 (Tue, 25 Mar 2014)

Remove the '1.8.x-r1578853' branch, merged in r1581683.

r1581683 | svn-role | 2014-03-25 23:00:57 -0500 (Tue, 25 Mar 2014)

Merge the 1.8.x-r1578853 branch:

 * r1578853, r1578875
   Fix svnserve to only send inherited properties when necessary.
   Justification:
     Performance regression from 1.7, reported by a user.
   Branch:
     ^/subversion/branches/1.8.x-r1578853
   Votes:
     +1: philip, rhuijben, ivan


r1579875 | svn-role | 2014-03-20 23:01:04 -0500 (Thu, 20 Mar 2014)

Remove the '1.8.x-r1574868' branch, merged in r1579874.

r1579874 | svn-role | 2014-03-20 23:00:49 -0500 (Thu, 20 Mar 2014)

Merge the 1.8.x-r1574868 branch:

 * r1574868
   Don't let invalid mergeinfo stop 'svnadmin dump' from producing a dump.
     Part of issue #4476 "Mergeinfo containing r0 makes svnsync and svnadmin
     dump fail".
   Justification:
     A formatting error in what is essentially client-side metadata, albeit
     with repository-side interpretation as well, should never prevent
     dumping the repository. This issue only occurs when svnadmin is trying
     to warn us of mergeinfo revisions that might be unexpected, so it is
     not essential.
   Notes:
     There is a work-around, at least in theory: a dump starting from
     revision 0 or 1 does not suffer from this problem.
   Branch:
     ^/subversion/branches/1.8.x-r1574868
   Votes:
     +1: julianfoad, philip, rhuijben


r1579528 | svn-role | 2014-03-19 23:00:48 -0500 (Wed, 19 Mar 2014)

Merge the r1575270 group from trunk:

 * r1575270, r1575284
   Fix inconsistent output in svn_client_proplist4 when using absolute paths.
   Notes:
     r1575284 is the test that exposes this bug.
   Justification:
     It's a regression in 1.8.8 compared to 1.8.5.
   Votes:
      +1: brane, rhuijben, philip


r1579130 | svn-role | 2014-03-18 23:00:47 -0500 (Tue, 18 Mar 2014)

Merge r1573088 from trunk:

 * r1573088
   Add Mavericks to our sysinfo output.
   Justification:
     It's obvious, keeps us consistent with previous version behavior.
   Votes:
     +1: breser, brane, rhuijben


r1579129 | svn-role | 2014-03-18 23:00:46 -0500 (Tue, 18 Mar 2014)

Merge the r1572102 group from trunk:

 * r1572102, r1572200
   Fix a failed wc upgrade from 1.7 with exclusive wc locking.
   Notes:
     1.8 doesn't support running the regression test with exclusive locking
     so the regression test always passes.
   Justification:
     Reported by a user, upgrade is expected to work.
   Votes:
     +1: philip, brane, rhuijben


r1575659 | svn-role | 2014-03-08 22:00:32 -0600 (Sat, 08 Mar 2014)

Merge r1571214 from trunk:

 * r1571214
   Avoid adding duplicated rows in an sqlite hint table when calling
   'svn upgrade' repeatedly on a working copy.
   Justification:
     Adding the same information multiple times is not a problem for sqlite,
     but it adds unnecessary information to wc.db, which will be slightly
     bigger than necessary in this corner case.
   Votes:
     +1: rhuijben, ivan, brane


r1575658 | svn-role | 2014-03-08 22:00:31 -0600 (Sat, 08 Mar 2014)

Merge r1498000 from trunk:

 * r1498000
   Improve error handling for inherited property requests by using the
   transition based xml parser in libsvn_ra_serf.
   Justification:
     This maintenance work which usually doesn't belong in a patch release
     makes it possible to properly detect if this request should be restarted
     on non-chunk-enabled proxies.
   Votes:
     +1: rhuijben, ivan, brane


r1569626 | svn-role | 2014-02-18 22:00:28 -0600 (Tue, 18 Feb 2014)

Merge the r1568953 group from trunk:

 * r1568953, r1568955
   Ensure that access to the FSFS transaction list and free transaction pointer
   is properly synchronized on Windows.
   Justification:
     Possible memory corruption in multi-threaded server on Windows. Regression
     from 1.7.x.
   Votes:
     +1: ivan, rhuijben, philip


r1569625 | svn-role | 2014-02-18 22:00:25 -0600 (Tue, 18 Feb 2014)

Remove the '1.7.x-r1568872-neon+serf' branch, merged in r1569624.

r1569624 | svn-role | 2014-02-18 22:00:09 -0600 (Tue, 18 Feb 2014)

Merge the 1.7.x-r1568872-neon+serf branch:

 * r1568943
   Justification:
     Fixes an API implementation bug in ra_serf and ra_neon.
   Notes:
     This a backport of r1568872 from trunk, with an equivalent change
     for ra_neon. r1568871 added a test case to JavaHL that exposed
     this bug on trunk, but it can't be used to test on 1.7.x. Trunk
     and branch code are identical in ra_serf, and ra_neon has an
     equivalent test with the same bug.
   Branch: ^/subversion/branches/1.7.x-r1568872-neon+serf
   Votes:
     +1: brane, rhuijben, ivan


r1569178 | svn-role | 2014-02-17 22:00:11 -0600 (Mon, 17 Feb 2014)

Merge r1568872 from trunk:

 * r1568872
   Justification:
     Fixes an API implementation bug in ra_serf.
   Notes:
     r1568871 added a test case to JavaHL that exposed this bug on trunk,
     but it can't be used to test on 1.8.x. Trunk and branch code are
     identical, however.
   Votes:
     +1: brane, rhuijben, ivan


r1569177 | svn-role | 2014-02-17 22:00:08 -0600 (Mon, 17 Feb 2014)

Merge r1567752 from trunk:

 * r1567752
   Fix, very occasional, spurious FAIL in autoprop_tests.py.
   Justification:
     Spurious FAILs confuse people.
   Votes:
     +1: philip, breser, brane
     +0: rhuijben (The patch is ok, but there is a better version on trunk)


r1568589 | svn-role | 2014-02-14 22:05:13 -0600 (Fri, 14 Feb 2014)

Remove the '1.7.x-neon-0.30' branch, merged in r1568588.

r1568588 | svn-role | 2014-02-14 22:04:58 -0600 (Fri, 14 Feb 2014)

Merge the 1.7.x-neon-0.30 branch:

 * r1566320
   Allow building with Neon 0.30.x.
   Justification:
     Version 0.30.0 is the latest Neon release, and the only reason that
     we cannot use it in 1.7.x is the restriction in configure.ac.
   Branch:
     ^/subversion/branches/1.7.x-neon-0.30
   Votes:
     +1: brane, breser, rhuijben


r1567520 | svn-role | 2014-02-11 22:04:53 -0600 (Tue, 11 Feb 2014)

Merge r1543187 from trunk:

 * r1543187
   Fix SWIG bindings not building in release mode with out of tree builds.
   Justification:
     Build systems should work.  This makes Branko cranky every release.
   Notes: Test by using ./autogen.sh --release, then do an out of tree build
     without this fix swig-py and swig-rb fail immediately.
   Votes:
     +1: breser, brane, rhuijben


r1566500 | svn-role | 2014-02-09 22:04:51 -0600 (Sun, 09 Feb 2014)

Merge r1535610 from trunk:

 * r1535610
   Filter out -no-cpp-precomp from flags passed to SWIG.
   Justification:
     Fixing swig bindings on OS X when used with the majority of the APR
     versions that incorrectly include this in their --cppflags output.
   Votes:
     +1: breser, philip, brane
     +0: rhuijben (looks good, untested)


r1564623 | svn-role | 2014-02-04 22:05:22 -0600 (Tue, 04 Feb 2014)

Merge the r1534149 group from trunk:

 * r1534149, r1535676
   In the windows CryptoAPI ssl certificate verification, properly handle
   certificates that are only trusted via intermediate authorities.
   Justification:
      While not strictly a bug, intermediate authorities are getting more
      common since recent Certificate Authority incidents.
   Notes:
      rhuijben: This introduces a new credential type as private API.
      Not sure about our strict ABI guarantees here, but this affects
      usability of users migrating to cloud platforms, etc.
   Votes:
     +1: rhuijben, steveking, breser


r1564622 | svn-role | 2014-02-04 22:05:19 -0600 (Tue, 04 Feb 2014)

Remove the '1.8.x-r1564215' branch, merged in r1564621.

r1564621 | svn-role | 2014-02-04 22:05:03 -0600 (Tue, 04 Feb 2014)

Merge the 1.8.x-r1564215 branch:

 * r1564215
   Reduce dynamic memory usage during c/o and export.
   Branch: ^/subversion/branches/1.8.x-r1564215
   Justification:
     Without this patch, operations using the standard reporter (at least
     svn: c/o and export; probably same for httpv1) use more or less
     unbounded amounts of memory.  Dynamic peaks of up to 20GB have been
     observed.  With this patch, those peaks come down to 100MB which
     matches our claim to streaminess.
   Votes:
     +1: stefan2, philip, breser


r1564620 | svn-role | 2014-02-04 22:05:00 -0600 (Tue, 04 Feb 2014)

Remove the '1.7.x-r1564215' branch, merged in r1564619.

r1564619 | svn-role | 2014-02-04 22:04:45 -0600 (Tue, 04 Feb 2014)

Merge the 1.7.x-r1564215 branch:

 * r1564215
   Reduce dynamic memory usage during c/o and export.
   Branch: ^/subversion/branches/1.7.x-r1564215
   Justification:
     Without this patch, operations using the standard reporter (at least
     svn: c/o and export; probably same for httpv1) use more or less
     unbounded amounts of memory.  Dynamic peaks of up to 20GB have been
     observed.  With this patch, those peaks come down to 100MB which
     matches our claim to streaminess.
   Votes:
     +1: stefan2, philip, breser


r1563372 | svn-role | 2014-01-31 22:04:38 -0600 (Fri, 31 Jan 2014)

Merge the r1541638 group from trunk:

 * r1541638, r1545302
   Fix automatic relocate during update for working copies that are
   not at repository root.
   Justification:
     Makes it much easier on users when their hoster migrates from http
     to https. (Too bad that there is no way to safely transfer credentials..)
   Votes:
     +1: rhuijben, philip, ivan


r1562351 | svn-role | 2014-01-28 22:04:39 -0600 (Tue, 28 Jan 2014)

Merge r1557522 from trunk:

 * r1557522
   Make mod_dav_svn report all property changes in 'include-properties' mode,
   even in uncommon configurations.
   Justification:
     This needs a fix in either client or server if we ever want to restart
     using the report copyfrom mode.
   Votes:
     +1: rhuijben, stefan2, philip


r1562350 | svn-role | 2014-01-28 22:04:38 -0600 (Tue, 28 Jan 2014)

Merge r1548486 from trunk:

 * r1548486
   When (during merge) we compare three files to each other stop reading
   specific files when we find enough differences.
   Justification:
     Trivial fix that can have a huge performance impact for some users.
   Votes:
     +1: rhuijben, stefan2, philip


r1562349 | svn-role | 2014-01-28 22:04:37 -0600 (Tue, 28 Jan 2014)

Merge the r1553101 group from trunk:

 * r1553101, r1553105, r1553113
   Resolve performance regression in certain 'svn log' scenarios, especially
   against pre Subversion 1.5 servers.
   Justification:
     Easy fix for improving performance for everybody. More generic patch for
     old versions might be needed for other scenarios, but those scenarios
     were never supported on those old versions itself.
   Votes:
     +1: rhuijben, stefan2, philip


r1562348 | svn-role | 2014-01-28 22:04:35 -0600 (Tue, 28 Jan 2014)

Merge the r1553376 group from trunk:

 * r1553376, r1553377
   Fix pool lifetime issue in serf commit processing for copied files and dirs
   Justification:
     Pool lifetime issues are bad. Reported by several git-svn users.
   Votes:
     +1: rhuijben, stefan2, philip


r1562347 | svn-role | 2014-01-28 22:04:34 -0600 (Tue, 28 Jan 2014)

Merge r1537018 from trunk:

 * r1537018
   Fix issue #4440, "Subversion sets permissions on files, when it shouldn't"
   Justification:
     Bug introduced by me. Unreasonable behaviour. User complained.
   Votes:
     +1: stsp, stefan2, philip
     +0.5: rhuijben (Change looks sane, but I'm unable to test this)


r1561585 | svn-role | 2014-01-26 22:04:31 -0600 (Sun, 26 Jan 2014)

Merge the r1404912 group from trunk:

 * r1404912, r1413402
   Allow compiling against Cyrus sasl 2.1.25 by 'fixing' a pointer cast.
   Notes:
     The structure contains a pointer to function that differs based
     on what the structure is used for. The type in the structure
     has changed between various sasl versions, but the
     implementation still uses the real prototype when calling.
   Justification:
     (Without this patch the Windows buildbot is broken for 1.7)
   Votes:
     +1: rhuijben, stefan2
     +1: brane (could not test the build on OSX because svnserve crashes
                during 'make check ENABLE_SASL=1')


r1561445 | svn-role | 2014-01-25 22:04:36 -0600 (Sat, 25 Jan 2014)

Merge r1548105 from trunk:

 * r1548105
   mod_dav_svn: Fix SVNAllowBulkUpdates directive merging.
   Justification:
     'SVNAllowBulkUpdates on' does not override other values
     configured for other <Location>
   Votes:
     +1: ivan, rhuijben, stefan2


r1561444 | svn-role | 2014-01-25 22:04:34 -0600 (Sat, 25 Jan 2014)

Merge the r1547866 group from trunk:

 * r1547866, r1547873, r1548097, r1548170
   Fix issue 3437, rep-cache.db created without group write bit
   Justification:
     Can prevent rep-cache from being used unless admin takes action.
   Votes:
     +1: philip, rhuijben, stefan2


r1561443 | svn-role | 2014-01-25 22:04:32 -0600 (Sat, 25 Jan 2014)

Merge the r1560690 group from trunk:

 * r1560690, r1560701
   Fix repository-WC copies into relocated working copies and some wc-wc
   copy problems.
   Justifiation:
     It should be impossible to break a working copy by just copying something
     into it.
   Notes:
     r1560690 is the fix and r1560701 a regression test for this problem.
   Votes:
     +1: rhuijben, brane, stefan2


r1561442 | svn-role | 2014-01-25 22:04:30 -0600 (Sat, 25 Jan 2014)

Merge r1535532 from trunk:

 * r1535532
   Make the certificate verification handling in ra_serf properly ask multiple
   providers for acceptance of certificate failures.
   Justification:
     Without this patch it is not possible to have one hook accept invalid
     ca roots, while another provider accepts an invalid date on a certificate.
     Probably only interesting for bindings and code that explicitly tests
     our certificate handling behavior.
   Votes:
     +1: rhuijben, stefan2, steveking


r1561441 | svn-role | 2014-01-25 22:04:29 -0600 (Sat, 25 Jan 2014)

Merge r1560690 from trunk:

 * r1560690
   Fix repository-WC copies into relocated working copies and some wc-wc
   copy problems.
   Justifiation:
     It should be impossible to break a working copy by just copying something
     into it.
   Notes:
     r1560701 is a regression test for this problem, but can't be backported
     without resolving a minor text conflict.
   Votes:
     +1: rhuijben, brane, stefan2


r1561252 | svn-role | 2014-01-24 22:04:27 -0600 (Fri, 24 Jan 2014)

Merge r1547774 from trunk:

 * r1547774
   Fix 'svn checkout ^/subversion/trunk NAS' of working copy with symlinks
   on Windows where the NAS doesn't implement FlushFileBuffers().
   Regression since 1.7.
   Justification:
     The checkout of symlink replacements shouldn't require more network
     capabilities than ordinary checkouts.
   Votes:
     +1: rhuijben, stefan2, steveking


r1559317 | svn-role | 2014-01-17 22:04:18 -0600 (Fri, 17 Jan 2014)

Merge r1559009 from trunk:

 * r1559009
   Fix swig-pl when built with --enable-sqlite-compatibility-version
   Justification:
     Build system should work.
   Votes:
     +1: breser
     +0: rhuijben


r1558692 | svn-role | 2014-01-15 22:04:14 -0600 (Wed, 15 Jan 2014)

Merge r1557320 from trunk:

 * r1557320
   Resolve segfault while handling OPTIONS request in unusual server
   configuration.
   Justification:
     User triggerable segfaults are bad. CVE-2014-0032
   Votes:
    +1: breser, stefan2, rhuijben


r1558292 | svn-role | 2014-01-14 22:04:13 -0600 (Tue, 14 Jan 2014)

Merge r1557320 from trunk:

 * r1557320
   Resolve segfault while handling OPTIONS request in unusual server
   configuration.
   Justification:
     User triggerable segfaults are bad. CVE-2014-0032
   Votes:
     +1: breser, rhuijben, stefan2


r1555656 | svn-role | 2014-01-05 22:04:10 -0600 (Sun, 05 Jan 2014)

Merge r1550803 from trunk:

 * r1550803
   Fix pool lifetime of variables in svn_client_commit_item3_t when duplicated.
   Justification:
     Pool lifetime issues are bad, and debugging them hard.
   Votes:
     +1: rhuijben, danielsh, stefan2


r1555655 | svn-role | 2014-01-05 22:04:09 -0600 (Sun, 05 Jan 2014)

Merge the r1544878 group from trunk:

 * r1544878, r1544895
   Fix output of svn --version -v to not cut info off on linux.
   Justification:
     Obviously wrong.
   Notes:
     The relevant code is #ifdeffed out on anything but linux.
   Votes:
     +1: breser (without r1544895), rhuijben, danielsh, stefan2


r1555654 | svn-role | 2014-01-05 22:04:07 -0600 (Sun, 05 Jan 2014)

Merge r1543961 from trunk:

 * r1543961
   Fix SWIG bindings building on OS X out of the tarball.
   Justification:
     Regression since 1.8
   Notes:
     Test by running ./autogen.sh --release and then building bindings
     on OS X.  Even if you run ./autogen.sh on a Mac the issue will
     still replicate.
   Votes:
     +1: breser, brane, stefan2


r1555653 | svn-role | 2014-01-05 22:04:05 -0600 (Sun, 05 Jan 2014)

Merge the r1542765 group from trunk:

 * r1542765, r1542767, r1542774
   Add or update an 'sqlite_stat1' table when creating or upgrading a database
   to make the Sqlite 3.8 'NG' query planner work with us instead of against
   us.
   Notes:
     r1542765 is the actual fix and a testcase which makes sure we don't
     accidentally add bad information whenever we update the schema.
     r1542767 and r1542774 are test suite tweaks to improve test coverage and
     to make sure we don't have false positive test failures on Sqlite 3.8.X.
   Votes:
     +1: rhuijben, brane, stefan2


r1555652 | svn-role | 2014-01-05 22:04:03 -0600 (Sun, 05 Jan 2014)

Merge r1535115 from trunk:

 * r1535115
   Make JavaHL tests run without installing on OS X.
   Justification:
     Shouldn't need to install code to test it.
   Votes:
     +1: breser, brane, stefan2


r1555651 | svn-role | 2014-01-05 22:04:01 -0600 (Sun, 05 Jan 2014)

Merge r1539309 from trunk:

 * r1539309 
   Fix test failure in checkout_tests.py after backporting of r1518184
   to 1.7.x in r1538135.
   Justification:
     The extended regression test relied on test suite behavior in 1.8+,
     by not passing a disk tree. The easy fix is to just pass a disk tree.
   Votes:
     +1: rhuijben, jcorvel, stefan2


r1544739 | svn-role | 2013-11-22 22:02:58 -0600 (Fri, 22 Nov 2013)

Merge r1543145 from trunk:

 * r1543145
   Properly end the list of errors we want to handle as warnings in svn's
   status handling. Without this patch we read invalid stack locations
   until we find a NULL.
   Justification:
     Regression since 1.8.
     https://bugzilla.redhat.com/show_bug.cgi?id=985582#c5
     (And the report from astieger on irc)
   Votes:
     +1: rhuijben, stsp, brane


r1544028 | svn-role | 2013-11-20 22:02:55 -0600 (Wed, 20 Nov 2013)

Merge the r1499470 group from trunk:

 * r1499470, r1543413
   Flush stdout before exiting svn with an error.
   Justification:
      Without this patch merge_tests.py 135 may fail to output its required
      output.
   Votes:
     +1: ivan (without r1543413)
     +1: rhuijben, stsp, pburba


r1543706 | svn-role | 2013-11-19 22:02:54 -0600 (Tue, 19 Nov 2013)

Merge r1541635 from trunk:

 * r1541635
   Allow using 'svn diff F:/' for those poor Windows users that have a working
   copy in the root of the drive.
   Justification:
     Endless recursion is bad, especially in case some users might get into
     this in a pretty normal code path.
   Votes:
     +1: rhuijben, philip, stsp


r1541804 | svn-role | 2013-11-13 22:03:04 -0600 (Wed, 13 Nov 2013)

Remove the '1.8.x-issue4448' branch, merged in r1541803.

r1541803 | svn-role | 2013-11-13 22:02:49 -0600 (Wed, 13 Nov 2013)

Merge the 1.8.x-issue4448 branch:

 * r1540044, r1540417
   Fix issue 4448: hotcopy losing revprop files in packed repositories.
   Justification:
     Hot copies of packed svn 1.6/1.7 repos will not contain revision
     properties - rendering 'svnadmin hotcopy' useless as a means of backup.
   Branch: ^/subversion/branches/1.8.x-issue4448
   Votes:
     +1: stefan2, philip, rhuijben
     +0.5: ivan (Looks fine, but I don't have enough expertise in this area
                 for full review')


r1541802 | svn-role | 2013-11-13 22:02:47 -0600 (Wed, 13 Nov 2013)

Merge r1541432 from trunk:

 * r1541432
   Fix potential crash in mod_authz_svn during startup if path specified
   by AuthzSVNAccessFile, AuthzSVNReposRelativeAccessFile, or 
   AuthzSVNGroupsFile directives is not accessible.
   Justification:
     Crash on invalid configuration.
   Votes:
     +1: ivan, stefan2, rhuijben


r1541801 | svn-role | 2013-11-13 22:02:46 -0600 (Wed, 13 Nov 2013)

Merge the r1537193 group from trunk:

 * r1537193, r1537221, r1540428
   Add test to verify if the used ZLib is affected by some block size bugs that
   affect our usage of serf.
   Justification:
     Most Windows binaries were affected by this bug and we should verify
     that we don't accidentally reintroduce this problem.
   Notes:
     This patch needs the source directory for obtaining its test data. The
     backport branch contains portions of r1537147 and r1537190 to enable
     this test.
   Branch: ^/subversion/branches/1.8.x-r1537193/
   Votes:
     +1: stefan2, rhuijben, ivan
     +1 (without r1540428): brane


r1541382 | svn-role | 2013-11-12 22:03:19 -0600 (Tue, 12 Nov 2013)

Remove the '1.7.x-fsfs-commit' branch, merged in r1541381.

r1541381 | svn-role | 2013-11-12 22:03:04 -0600 (Tue, 12 Nov 2013)

Merge the 1.7.x-fsfs-commit branch:

 * r1536790
   Limit the time spent in committing files with deep change histories
   Justification:
      The problem has been observed in the real world with certain
      committs taking hours instead of seconds.  This patch sets a
      firm limit to the internal processing effort and cuts it down
      from several hours to a few minutes.
   Branch:
     ^/subversion/branches/1.7.x-fsfs-commit
   Votes:
     +1: stefan2, brane, breser


r1541380 | svn-role | 2013-11-12 22:03:01 -0600 (Tue, 12 Nov 2013)

Remove the '1.7.x-r1527103' branch, merged in r1541379.

r1541379 | svn-role | 2013-11-12 22:02:45 -0600 (Tue, 12 Nov 2013)

Merge the 1.7.x-r1527103 branch:

 * r1527112
   Fix OOM with concurrent requests right after threaded server start.
   Changes:
     This was a common condition in my load tests.  Affects threaded
     servers only.  Apache will just respawn a new worker process.
   Branch:
     ^/subversion/branches/1.7.x-r1527103
   Votes:
     +1: stefan2, brane, breser


r1540941 | svn-role | 2013-11-11 22:02:42 -0600 (Mon, 11 Nov 2013)

Merge r1516806 from trunk:

 * r1516806
   Do not look at the hostname part of an URI when checking that
   the schema data is canonical.
   Justification:
     As reported on dev@, "svn co file://./" and similar commands abort
     instead of returning an error that the URL is invalid.  This was
     caused by svn_uri_is_canonical treating the hostname "." as a path
     segment.  After this change, svn_uri_is_canonicall correctly
     determines that the URL is (syntactically) canonical, and the
     commands later fail with a normal error in the RA layer, which
     validates the semantics of the hostname.
   Votes:
     +1: brane, stefan2, philip


r1540441 | svn-role | 2013-11-09 22:03:06 -0600 (Sat, 09 Nov 2013)

Merge the r1538516 group from trunk:

 * r1538516, r1538517, r1538519, r1538574, r1538581
   Fix issue #4444, "diffing move inside a copy asserts"
   Justification:
     I want to get to a pub on Friday so let's get this done.
     http://svn.haxx.se/users/archive-2013-11/0037.shtml
   Votes:
     +1: stsp, rhuijben, stefan2


r1540440 | svn-role | 2013-11-09 22:03:03 -0600 (Sat, 09 Nov 2013)

Merge r1536537 from trunk:

 * r1536537
   Fix build of ctypes-python on newer OS X versions.
   Justificaton:
     Build system should work.  We shouldn't be trying to use the CPP from the
     APR build anyway.
   Votes:
     +1: breser, brane, stefan2


r1540439 | svn-role | 2013-11-09 22:03:01 -0600 (Sat, 09 Nov 2013)

Merge r1535161 from trunk:

 * r1535161
   Make swig-rb tests run without installing on OS X.
   Justification:
     Shouldn't need to install code to test it.  The existing Makefile target
     is just downright wrong.
   Votes:
     +1: breser, brane, stefan2


r1540438 | svn-role | 2013-11-09 22:02:58 -0600 (Sat, 09 Nov 2013)

Remove the '1.8.x-openssl-dirs' branch, merged in r1540437.

r1540437 | svn-role | 2013-11-09 22:02:42 -0600 (Sat, 09 Nov 2013)

Merge the 1.8.x-openssl-dirs branch:

 * r1535139
   Make openssl lib and include directory available when using --with-openssl
   on Windows.
   Justification:
     Serf 1.2 simply included the openssl static library in its own static
     library, which made it very easy for Subversion to consume, but added the
     risk of linking to many different openssl versions (both static and
     shared builds) at once. This bug in serf was fixed for 1.3 and we
     updated Subversion to use 1.3 for Subversion 1.8.4, but without this
     patch we added the assumption that ssleay32.lib and libeay32.lib are
     within some existing referenced library directory.
     This patch fixes that assumption by adding the right libdir to our build,
     by borrowing some code from trunk.
   Branch: ^/subversion/branches/1.8.x-openssl-dirs
   Votes:
     +1: rhuijben, ivan, stefan2


r1539235 | svn-role | 2013-11-05 22:02:53 -0600 (Tue, 05 Nov 2013)

Remove the '1.7.x-issue4153' branch, merged in r1539234.

r1539234 | svn-role | 2013-11-05 22:02:38 -0600 (Tue, 05 Nov 2013)

Merge the 1.7.x-issue4153 branch:

 * r1306275, and other revisions
   New diff support code for added/deleted files and directories.
   Fixes issue #4153, "svn log --diff" on moved file gives "not found",
   and other problems such as issue #4421, "diff --summarize of a child of
   a newly added child causes crash" (over HTTP only).
   Justification:
     The current code (introduced in 1.7.x in the r1207351 backport commit)
     produces inconsistent paths in diff output (see
     http://svn.haxx.se/dev/archive-2012-03/0385.shtml), and it also breaks
     with the paradigm that the target of an editor drive may never have more
     than one path component (which according to cmpilato is an API violation).
   Notes:
     Please read the branch and related trunk log messages for detailed notes
     about these changes.
     breser: Not so fond of the temp file use but 1.8.x is out with a much
     better implementation anyway.
   Branch:
     ^/subversion/branches/1.7.x-issue4153
   Votes:
     +1: breser, julianfoad, stsp


r1538861 | svn-role | 2013-11-04 22:02:48 -0600 (Mon, 04 Nov 2013)

Remove the '1.7.x-r1426762' branch, merged in r1538860.

r1538860 | svn-role | 2013-11-04 22:02:33 -0600 (Mon, 04 Nov 2013)

Merge the 1.7.x-r1426762 branch:

 * r1426762
   Fix issue #4283, When the identical suffix starts at chunk boundary, "svn
   diff" produces incorrect diff.
   Justification:
     Without this patch the identical suffix might show up as an added or
     deleted suffix of a file.
   Branch:
     ^/subversion/branches/1.7.x-r1426762
   Votes:
     +1: rhuijben, jcorvel, julianfoad
     +0: stsp (doesn't compile, undefined reference to `svn_stringbuf_insert')
              (referring to r1426762 by itself without the branch)


r1538142 | svn-role | 2013-11-01 23:02:55 -0500 (Fri, 01 Nov 2013)

Merge r1525902 from trunk:

 * r1525902
   Fix issues #4428, #4429: "checkout via http with external pointing at
   redirected URL".
   Justification:
     Such a stupid mistake, to carefully follow the URL redirection just to
     use the unredirected URL subsequently. Breaks externals as soon as the
     repository URL gets redirected.
   Notes:
     I'd be glad to add a regression test, but I'm not entirely clear on how
     to make our test suite model an external to a redirected URL. A testing
     recipe is in issue #4428.
   Votes:
     +1: neels, rhuijben, brane


r1538141 | svn-role | 2013-11-01 23:02:54 -0500 (Fri, 01 Nov 2013)

Merge the r1537360 group from trunk:

 * r1537360, r1537415, r1537555, r1537700
   mod_dav_svn: Set r->filename to a bogus value rather than NULL.
   Justification:
     Some httpd modules (mod_wsgi) assume that r->filename is not NULL and
     don't bother to check before dereferincing.  Regression from earlier
     1.8.x releases and user found server crash.
   Votes:
     +1: breser, rhuijben, brane


r1538140 | svn-role | 2013-11-01 23:02:52 -0500 (Fri, 01 Nov 2013)

Merge the r1537360 group from trunk:

 * r1537360, r1537415, r1537555, r1537700
   mod_dav_svn: Set r->filename to a bogus value rather than NULL.
   Justification:
     Some httpd modules (mod_wsgi) assume that r->filename is not NULL and
     don't bother to check before dereferincing.  Regression from earlier
     1.7.x releases and user found server crash.
   Votes:
     +1: breser, rhuijben, brane


r1538139 | svn-role | 2013-11-01 23:02:50 -0500 (Fri, 01 Nov 2013)

Merge r1524869 from trunk:

 * r1524869
   JavaHL: Canonicalize path for streamFileContent method.
   Justification:
      JavaHL is designed around us doing the canonicalization.
   Votes:
     +1: breser, stefan2, brane


r1538138 | svn-role | 2013-11-01 23:02:48 -0500 (Fri, 01 Nov 2013)

Remove the '1.7.x-issue4428' branch, merged in r1538137.

r1538137 | svn-role | 2013-11-01 23:02:33 -0500 (Fri, 01 Nov 2013)

Merge the 1.7.x-issue4428 branch:

 * r1525902
   Fix issues #4428 and #4429: external references a redirected HTTP-URL.
   Changes:
     In handle_external_item_change(), a redirect was effectively ignored by
     passing the old URL to switch_dir_external(). Pass the new one.
   Branch:
     ^/subversion/branches/1.7.x-issue4428
   Votes:
     +1: neels, stefan2, brane


r1538136 | svn-role | 2013-11-01 23:02:31 -0500 (Fri, 01 Nov 2013)

Merge r1522892 from trunk:

 * r1522892
   Fix issue #4425 and #3014 on Windows: svn.exe crashed when output of 'log'
   command interrupted when using ra_serf.
   Changes[client]:
     * fixed: command line client crashes when piped command is interrupted on
       Windows.
   Justification:
     User reported crash.
   Votes:
     +1: rhuijben, stefan2, brane


r1538135 | svn-role | 2013-11-01 23:02:29 -0500 (Fri, 01 Nov 2013)

Merge r1518184 from trunk:

 * r1518184
   Fix an of-by-one error in the fspath calculations of libsvn_ra_local,
   for the specific case where a repository is placed in a Windows drive
   root.
   Justification:
     Improves correctness. Resolves user reported problem.
   Votes:
     +1: rhuijben, stefan2, brane


r1536049 | svn-role | 2013-10-26 23:02:21 -0500 (Sat, 26 Oct 2013)

Merge the r1501656 group from trunk:

 * r1501656, r1501702
   Fix the ability to build Debug Build with BDB FS on Windows.
   Justification:
     Our build system should work properly.
   Votes:
     +1: breser, stefan2
     +1: rhuijben (I prefer the trunk code that performs a real bdb install
                   check, but it might help in some dev environments)


r1535275 | svn-role | 2013-10-23 23:02:16 -0500 (Wed, 23 Oct 2013)

Merge r1534860 from trunk:

 * r1534860
   Remove -fwhole_program flag from optimized GCC builds.
   Justification:
     As described in http://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html,
     -flto is superior and should not be combined with -fwhole-program.
     As it turns out, -fwhole_program causes issues with llvm and other
     sources indicated that the flag might not be particularly useful to
     begin with.
   Votes:
     +1: stefan2, breser, brane


r1534485 | svn-role | 2013-10-21 23:02:23 -0500 (Mon, 21 Oct 2013)

Merge r1534158 from trunk:

 * r1534158
   Correct error message when FSFS detects unsupported future formats.
   Justification:
      The admin should see a "format number error" instead of "unknown
      format option error" for format bumps that also add new options.
   Votes:
     +1: stefan2, breser, rhuijben


r1534484 | svn-role | 2013-10-21 23:02:22 -0500 (Mon, 21 Oct 2013)

Merge r1526439 from trunk:

 * r1526439
   Improve http status processing during commit using ra_serf to improve
   diagnostics.
   Justification:
      With this patch the problem described as issue #4431, would
      probably have been diagnosed months ago.
   Votes:
     +1: rhuijben, ivan, breser


r1534483 | svn-role | 2013-10-21 23:02:20 -0500 (Mon, 21 Oct 2013)

Merge r1518184 from trunk:

 * r1518184
   Fix an of-by-one error in the fspath calculations of libsvn_ra_local,
   for the specific case where a repository is placed in a Windows drive
   root.
   Justification:
     Improves correctness. Resolves user reported problem.
   Votes:
     +1: rhuijben, stefan2, ivan


r1534482 | svn-role | 2013-10-21 23:02:19 -0500 (Mon, 21 Oct 2013)

Merge the r1527103 group from trunk:

 * r1527103, r1527105
   Fix OOM with concurrent requests right after threaded server start.
   Justification:
      This was a common condition in my load tests.  Affects threaded
      servers only.  Apache will just respawn a new worker process.
   Votes:
     +1: stefan2, ivan, rhuijben


r1534481 | svn-role | 2013-10-21 23:02:18 -0500 (Mon, 21 Oct 2013)

Merge r1534102 from trunk:

 * r1534102
   On Windows: stop linking agains psapi.dll.
   Justification:
     Removes a 100% dependency on Windows components that are usually not loaded.
     Affects initial performance of svn.exe invocations.
   Votes:
     +1: rhuijben, ivan, stefan2     


r1534480 | svn-role | 2013-10-21 23:02:16 -0500 (Mon, 21 Oct 2013)

Merge r1532023 from trunk:

 * r1532023
   Resolve possible segfault in the win32 crash handler.
   Justification:
      The crash handler shouldn't crash, but report the original
      crash.
   Votes:
     +1: rhuijben, stefan2, ivan


r1534479 | svn-role | 2013-10-21 23:02:15 -0500 (Mon, 21 Oct 2013)

Merge the r1501199 group from trunk:

 * r1501199, r1501207, r1502777
   Verify the result of the xml parser in ra serf, instead of assuming the
   parsing always succeeds.
   Justification:
     While in general we can just rely on the parsed result being incomplete,
     this makes many network (and server implementation) problems easier to
     diagnose.
   Votes:
     +1: rhuijben, stefan2, ivan


r1532178 | svn-role | 2013-10-14 23:02:04 -0500 (Mon, 14 Oct 2013)

Merge r1524869 from trunk:

 * r1524869
   JavaHL: Canonicalize path for streamFileContent method.
   Justification:
      JavaHL is designed around us doing the canonicalization.
   Votes:
     +1: breser, stefan2
     +0: rhuijben


r1530855 | svn-role | 2013-10-09 23:02:06 -0500 (Wed, 09 Oct 2013)

Merge r1523666 from trunk:

 * r1523666
   Fix path corruption in the calculation of reintegration merges.
   Justification:
     User reported path corruption. Possibly leading to invalid merge
     suggestions. See http://svn.haxx.se/users/archive-2013-09/0116.shtml
   Notes:
     This appears to be a regression in 1.8 as 1.7 has a similar check.
     To reproduce the problem, run in a working copy of 1.8.x:
         svn merge --reintegrate ^/subversion/branches/1.7.x
     and look for bad paths in 'Missing ranges' lines, e.g. '.../svnmucc.'
     which should be '.../svnmucc.c'.
   Votes:
     +1: rhuijben, stsp, stefan2


r1530854 | svn-role | 2013-10-09 23:02:04 -0500 (Wed, 09 Oct 2013)

Merge r1522892 from trunk:

 * r1522892
   Fix issue #4425 and #3014 on Windows: svn.exe crashed when output of 'log'
   command interrupted.
   Changes[client]:
     * fixed: command line client crashes when piped command is interrupted on
       Windows.
   Justification:
     User reported crash.
   Votes:
     +1: ivan, rhuijben, stefan2


r1530853 | svn-role | 2013-10-09 23:02:03 -0500 (Wed, 09 Oct 2013)

Merge the r1520529 group from trunk:

 * r1520529, r1520532, r1520539
   Properly re-canonicalize urls read from xml based entries files.
   Justification:
     The canonicalization rules have been changed since 1.3 and while
     we fixed the newer entries file parsing we forgot the xml based
     entries.  Fixes a client assert.
   Votes:
     +1: rhuijben, philip, stefan2


r1530852 | svn-role | 2013-10-09 23:02:02 -0500 (Wed, 09 Oct 2013)

Merge r1519955 from trunk:

 * r1519955
   Fix a segfault with 'svn mergeinfo'.
   Justification:
     Missing NULL pointer checks are bad, user complained.
   Votes:
     +1: stsp, rhuijben, stefan2


r1530851 | svn-role | 2013-10-09 23:02:00 -0500 (Wed, 09 Oct 2013)

Merge the r1519615 group from trunk:

 * r1519615, r1519617, r1519733
   Fix a memory problem in the 3rd party FS module loader.
   Changes[dev]:
    * fs loader: fix segfault with 3rd party modules and common_pool (rNNNNNNN)
   Justification:
     Not enabled in default build but a SEGV likely when triggered.
   Votes:
     +1: philip, danielsh, stefan2


r1530850 | svn-role | 2013-10-09 23:01:59 -0500 (Wed, 09 Oct 2013)

Merge r1516806 from trunk:

 * r1516806
   Do not look at the hostname part of an URI when checking that
   the schema data is canonical.
   Justification:
     As reported on dev@, "svn co file://./" and similar commands abort
     instead of returning an error that the URL is invalid.  This was
     caused by svn_uri_is_canonical treating the hostname "." as a path
     segment.  After this change, svn_uri_is_canonicall correctly
     determines that the URL is (syntactically) canonical, and the
     commands later faile with a normal error in the RA layer, which
     validates the semantics of the hostname.
   Votes:
     +1: brane, rhuijben, stefan2


r1530849 | svn-role | 2013-10-09 23:01:57 -0500 (Wed, 09 Oct 2013)

Merge the r1520529 group from trunk:

 * r1520529, r1520532, r1520539
   Properly re-canonicalize urls read from xml based entries files.
   Justification:
     The canonicalization rules have been changed since 1.3 and while
     we fixed the newer entries file parsing we forgot the xml based
     entries.  Fixes a client assert.
   Votes:
     +1: rhuijben, philip, stefan2


r1523183 | svn-role | 2013-09-13 23:01:22 -0500 (Fri, 13 Sep 2013)

Merge the r1468980 group from trunk:

 * r1468980, r1478987, r1502811
   Reduce the number of ra sessions for automatic merge calculations to two.
   Justification:
     10 concurrent ra sessions open to a single server at the same time breaks
     in certain setups (e.g. xinetd svnserve), while we really don't need this
     many. Opening ra session is still a performance killer in all other
     scenarios, so reducing the number of sessions is a good thing.
   Notes:
     Depends on r1502901 and r1502909, to avoid ra-session reuse errors.
     r1468980 is a small performance tweak needed for a clean merge.
     r1478987 removes a common ra session.
     r1502811 avoids all ra session creations via svn_client__mergeinfo_log.
   Votes:
     +1: rhuijben, stefan2, ivan
     +0: breser (I see that the call to
                 svn_ra__assert_mergeinfo_capable_server() was removed from
                 get_mergeinfo() in mergeinfo.c, but not mentioned in commit
                 logs.  Looking at the code it seems that finding out if the
                 server and repo support merginfo requires trying to get some,
                 but don't we need to pretty up the error here like the assert
                 would do for us?)


r1520723 | svn-role | 2013-09-06 23:01:13 -0500 (Fri, 06 Sep 2013)

Merge the r1512300 group from trunk:

 * r1512300, r1512301
   Clean up unpacked revprops in 'svnadmin hotcopy --incremental'
   Justification:
     Although keeping the unpacked revprop files should not do
     harm, it still results in the target repo being different
     from the source.  Also, it wastes disc space.
   Notes:
     r1512300 is merely a test case update to reproduce the problem.
   Votes:
     +1: stefan2, breser, rhuijben


r1515704 | svn-role | 2013-08-19 23:01:12 -0500 (Mon, 19 Aug 2013)

Merge the r1512432 group from trunk:

 * r1512432, r1512471, r1512472, r1513463, r1513472
   mod_dav_svn: No longer map requests to the filesystem.
   Justification:
     Prevents httpd from logging garbage filenames with %f and stops Directory
     blocks from matching against requests served by mod_dav_svn.
   Votes:
     +1: breser, philip, ivan
     +0: rhuijben (in concept;
                   +1 for the documentation changes in r1513463, r1513472)


r1515703 | svn-role | 2013-08-19 23:01:09 -0500 (Mon, 19 Aug 2013)

Remove the '1.8.x-svnsync-serf-memory' branch, merged in r1515702.

r1515702 | svn-role | 2013-08-19 23:00:53 -0500 (Mon, 19 Aug 2013)

Merge the 1.8.x-svnsync-serf-memory branch:

 * ^/subversion/branches/1.8.x-svnsync-serf-memory
   ra_serf: Fix high memory usage running svnsync.
   Branch: ^/subversion/branches/1.8.x-svnsync-serf-memory
   Justification:
     Causes svnsync to fail due to excessive memory usage.
   Notes:
     Fixed directly on 1.8.x since the switch to transition based parser solved
     this there.  See r1515249 and r1515269 on branch for the specific changes.
   Votes:
     +1: breser, philip, stefan2


r1515701 | svn-role | 2013-08-19 23:00:52 -0500 (Mon, 19 Aug 2013)

Merge r1515141 from trunk:

 * r1515141
   Update documentation of mod_dav_svn installation to reflect changes
   not-so-recently-made to configure's defaults.
   Justification:
     INSTALL should document configure's defaults correctly.
   Votes:
     +1: danielsh, philip


r1515700 | svn-role | 2013-08-19 23:00:51 -0500 (Mon, 19 Aug 2013)

Merge the r1514785 group from trunk:

 * r1514785, r1515201
   ra_serf: Improve SSL certificate verification failure message.
   Justification:
     Generic 'Server SSL certificate untrusted' error message is not
     informative. Regression from Subversion 1.7.x
   Votes:
     +1: danielsh, breser, ivan
     +1 (r1514785 only): stefan2


r1515699 | svn-role | 2013-08-19 23:00:49 -0500 (Mon, 19 Aug 2013)

Merge r1503318 from trunk:

 * r1503318
   ra_serf: Do not retry HTTP requests if we started to parse them.
   Discussion: http://svn.haxx.se/dev/archive-2013-07/0290.shtml
   Justification:
      There is absolutely no guarantee that REPORT or PROPFIND responses will
      be equal for every request. Before r1503318 after request we skipped
      recieved N bytes of original request response and continue with
      remaining bytes from retried request. 
   Votes:
     +1: ivan, rhuijben, philip
     +0: danielsh


r1515698 | svn-role | 2013-08-19 23:00:48 -0500 (Mon, 19 Aug 2013)

Merge r1514804 from trunk:

 * r1514804
   ra_serf: Format distinguished names properly.
   Justification:
     Displaying "Issuer: (null), (null), (null), Thawte, US (null)"
     in SSL certificate confirmation is bad. Regression from
     Subversion 1.7.x.
   Votes:
     +1: ivan, stefan2, danielsh


r1515070 | svn-role | 2013-08-17 23:01:05 -0500 (Sat, 17 Aug 2013)

Merge r1514763 from trunk:

 * r1514763
   ra_serf: Use case-insensitive hostname comparision when validating server
   certificate as it specified in RFC 2459.
   Justification:
     SSL certificate with uppercase letters in hostname considered as
     untrusted. Regression from Subversion 1.7.x.
   Votes:
     +1: ivan, rhuijben, stefan2


r1515069 | svn-role | 2013-08-17 23:01:01 -0500 (Sat, 17 Aug 2013)

Remove the '1.7.x-gssapi-solaris10' branch, merged in r1515068.

r1515068 | svn-role | 2013-08-17 23:00:46 -0500 (Sat, 17 Aug 2013)

Merge the 1.7.x-gssapi-solaris10 branch:

 * ^/subversion/branches/1.7.x-gssapi-solaris10
   Justification:
     Make it easier to build svn+serf with kerberos support on Solaris10.
   Branch:
     ^/subversion/branches/1.7.x-gssapi-solaris10
   Notes:
     rhuijben: Is this necessary for 1.7. I think gssapi was moved to serf
     with/before serf 1.0, which is a 1.7 requirement?
     breser: serf 0.7.1 is the 1.7 requirement.  I was underthe impression
     when I did this that serf didn't have gssapi code until later.
     serf 0.7.1 does have code support for gssapi but not build system
     support.  From a user perspective they're going to try to use our
     gssapi options since we have them and advertise them while serf
     doesn't.  So I think we should include this fix.
   Votes:
     +1: breser, rhuijben, stefan2


r1515067 | svn-role | 2013-08-17 23:00:45 -0500 (Sat, 17 Aug 2013)

Merge r1482282 from trunk:

 * r1482282
   Don't use unitialized variable to produce an error code.
   Justification:
     Silence compiler warning. Getting in this error path is as far as I can
     tell impossible on Windows 2000 and later, but might be possible on Wine.
     (Getting into this error path requires an on-disk path of the running
      application that can't be expressed in unicode, which is very hard if the
      path itself is stored in Unicode)
   Votes:
     +1: rhuijben, breser, stefan2
     +0: danielsh (don't know whether GetLastError is the right API here)


r1514946 | svn-role | 2013-08-16 23:01:23 -0500 (Fri, 16 Aug 2013)

Merge the r1514315 group from trunk:

 * r1514315, r1514628
   Use loaded serf version for User-Agent, not version used for compilation.
   Justification:
     Wrong User-Agent string is not good thing.
   Votes:
     +1: ivan, danielsh, philip


r1514945 | svn-role | 2013-08-16 23:01:20 -0500 (Fri, 16 Aug 2013)

Remove the '1.7.x-issue4408' branch, merged in r1514944.

r1514944 | svn-role | 2013-08-16 23:01:05 -0500 (Fri, 16 Aug 2013)

Merge the 1.7.x-issue4408 branch:

 * ^/subversion/branches/1.7.x-issue4408
   Fix invalid output from diff --summarize.
   Branch:
     ^/subversion/branches/1.7.x-issue4408
   Justification:
     User ran into the issue and reported it.  Relatively straightforward fix.
   Notes:
     See r1512154 for the actual change to review on the branch.
   Votes:
     +1: breser, philip, rhuijben


r1514943 | svn-role | 2013-08-16 23:01:01 -0500 (Fri, 16 Aug 2013)

Remove the '1.7.x-issue4306' branch, merged in r1514942.

r1514942 | svn-role | 2013-08-16 23:00:46 -0500 (Fri, 16 Aug 2013)

Merge the 1.7.x-issue4306 branch:

 * r1438602, r1438683, r1441810
   Fix issue #4306, "multiple editor drive file merges record wrong mergeinfo
   during conflicts"
   Justification:
     Bogus mergeinfo is created during conflicting merges with file targets.
   Notes: r1438602 is the initial test and r1438683 the initial fix. r1441810
     is a follow-up that addressed a bug in the initial fix (see
     http://svn.haxx.se/dev/archive-2013-02/0001.shtml) and also reworked the
     test to use prop edits rather than text edits as the changes to be
     merged.  Unfortunately, 1.7.x has unrelated problems with property
     conflicts: It doesn't abort the merge if it encounters them!  It merrily
     plugs along sans any "One or more conflicts were produced while
     merging...resolve all conflicts and rerun the merge to apply the
     remaining unmerged revisions" error (this is fixed on trunk).  So while
     r1441810 is a valid fix (IMO) its test fails for unrelated reasons.  So
     I reworked the earlier version of test to demonstrate the problem
     r1441810 fixes, but using file conflicts.
   Branch:
     ^/subversion/branches/1.7.x-issue4306
   Votes:
     +1: stsp, pburba, rhuijben


r1514941 | svn-role | 2013-08-16 23:00:44 -0500 (Fri, 16 Aug 2013)

Merge the r1512432 group from trunk:

 * r1512432, r1512471, r1512472, r1513463, r1513472
   mod_dav_svn: No longer map requests to the filesystem.
   Justification:
     Prevents httpd from logging garbage filenames with %f and stops Directory
     blocks from matching against requests served by mod_dav_svn.
   Votes:
     +1: breser, philip, ivan


r1514572 | svn-role | 2013-08-15 23:00:43 -0500 (Thu, 15 Aug 2013)

Merge r1490684 from trunk:

 * r1490684
   Return 500 rather than 409 when commit fails and it is not a conflict.
   Justification:
     Not a client failure so 4xx is wrong.
   Votes:
     +1: philip, brane, breser


r1514152 | svn-role | 2013-08-14 23:00:47 -0500 (Wed, 14 Aug 2013)

Merge the r1504192 group from trunk:

 * r1504192, r1504505
   Make 'svn diff' continue on missing and obstructing files.
   This resolves issue 4396
   Justification:
     Regression since 1.7.
   Votes:
     +1: philip, rhuijben, stefan2


r1514151 | svn-role | 2013-08-14 23:00:46 -0500 (Wed, 14 Aug 2013)

Merge the r1503010 group from trunk:

 * r1503010, r1503058, r1503061, r1503211
   svn_utf_*: Describe APR errors as coming from APR.
   Justification:
     It is not obvious what needs to be recompiled to resolve "This function
     has not been implemented on this platform".  We do the same for SQLite.
     .
     The current code will not enter the error path in the ENOTIMPL case; that
     is being discussed on dev@ still.  The "Justification" field uses that
     error code is used as an example only.
   Votes:
     +1: danielsh, rhuijben, stefan2


r1514150 | svn-role | 2013-08-14 23:00:44 -0500 (Wed, 14 Aug 2013)

Merge the r1506966 group from trunk, with --accept=mc:

 * r1506966, r1511603
   Don't do double UTF8-to-native conversion in svnadmin notifications.
   Justification:
     Double conversion can produce garbled output in non-UTF8 environments.
   Notes:
     Reverts r1485650 on trunk, which was merged to 1.8.x in r1486284.
     Merge with --accept mc to resolve conflict.
   Votes:
     +1: philip, danielsh, stefan2


r1514149 | svn-role | 2013-08-14 23:00:42 -0500 (Wed, 14 Aug 2013)

Merge r1508438 from trunk:

 * r1508438
   Try harder to pass an existing path to sleep for timestamps
   Justification:
     Performance regression from 1.6, reported by user.
   Votes:
     +1: philip, rhuijben, stefan2


r1514148 | svn-role | 2013-08-14 23:00:41 -0500 (Wed, 14 Aug 2013)

Merge r1513156 from trunk:

 * r1513156
   Fix crash when updating in libsvn_wc/update_editor.c, window_handler().
   Justification:
     Multiple crash reports:
     http://svn.haxx.se/dev/archive-2013-06/0385.shtml
   Votes:
     +1: ivan, philip, rhuijben


r1513722 | svn-role | 2013-08-13 23:00:40 -0500 (Tue, 13 Aug 2013)

Merge r1511353 from trunk:

 * r1511353
   svnmucc: Fix an assertion failure.
   Justification:
     It's an assertion failure.
   Votes:
     +1: danielsh, rhuijben, ivan


r1513335 | svn-role | 2013-08-12 23:00:41 -0500 (Mon, 12 Aug 2013)

Merge the r1513119 group from trunk:

 * r1513119, r1513122
   Correctly error out for large files in svn_diff_file_output_merge2() on
   32-bit platforms.
   Justification:
     Silently converting file size to apr_size_t is definitely wrong. Got
     related crashes in TortoiseSVN code.
   Votes:
     +1: ivan, philip, rhuijben


r1513334 | svn-role | 2013-08-12 23:00:40 -0500 (Mon, 12 Aug 2013)

Merge the r1507382 group from trunk:

 * r1507382, r1509186, r1509196
   Allow passing NULL for the config dir to svn_config_walk_auth_data to use
   the default config dir path, like other functions handle this.
   Justification: all other APIs that take a config dir param allow NULL as
     meaning the default config path. Clients should not try to figure out
     that path themselves.
   Notes:
      r1509186 and r1509196 update the docstring accordingly.
   Votes:
     +1: steveking, philip, ivan, rhuijben


r1512559 | svn-role | 2013-08-09 23:00:50 -0500 (Fri, 09 Aug 2013)

Remove the '1.8.x-issue4400' branch, merged in r1512558.

r1512558 | svn-role | 2013-08-09 23:00:35 -0500 (Fri, 09 Aug 2013)

Merge the 1.8.x-issue4400 branch:

 * r1507567, r1507589, r1512195
   Fix issue #4400: crash when committing cp with deep deletion.
   Branch:
     ^/subversion/branches/1.8.x-issue4400
   Justification:
     SEGV and Regression from 1.7.
   Votes:
     +1: breser, danielsh, ivan


r1511573 | svn-role | 2013-08-07 23:01:08 -0500 (Wed, 07 Aug 2013)

Remove the '1.8.x-r1507044' branch, merged in r1511572.

r1511572 | svn-role | 2013-08-07 23:00:53 -0500 (Wed, 07 Aug 2013)

Merge the 1.8.x-r1507044 branch:

 * r1507044
   Fix a bug in the Perl bindings.
   Justification: The bug makes scripts using SVN::Client look like
     as if they didn't honor config settings from ~/.subversion/servers,
     though they should by default.
   Branch: ^/subversion/branches/1.8.x-r1507044
   Votes:
     +1: rschupp, danielsh


r1511571 | svn-role | 2013-08-07 23:00:51 -0500 (Wed, 07 Aug 2013)

Merge r1511057 from trunk:

 * r1511057
   Fix issue #4044: "svn log -v" fails with a 1.2.x server.
   Justification:
     Regression in 1.8.0 (ra_serf), basic functionality now fails with older
     servers which we still need to support.
   Votes:
     +1: lgo, gstein, philip


r1511570 | svn-role | 2013-08-07 23:00:48 -0500 (Wed, 07 Aug 2013)

Remove the '1.7.x-r1507044' branch, merged in r1511569.

r1511569 | svn-role | 2013-08-07 23:00:33 -0500 (Wed, 07 Aug 2013)

Merge the 1.7.x-r1507044 branch:

 * r1507044
   Fix a bug in the Perl bindings.
   Branch: ^/subversion/branches/1.7.x-r1507044
   Justification: The bug makes scripts using SVN::Client look like
     as if they didn't honor config settings from ~/.subversion/servers,
     though they should by default.
   Votes:
     +1: rschupp, danielsh


r1507570 | svn-role | 2013-07-26 23:00:17 -0500 (Fri, 26 Jul 2013)

Merge the r1506040 group from trunk:

 * r1506040, r1506041, r1506058
   Fix issue 4398, 'svn status' paths relative to current working directory
   Justification:
     Regression from 1.7.
   Votes:
     +1: philip, rhuijben, steveking


r1503555 | svn-role | 2013-07-15 23:00:17 -0500 (Mon, 15 Jul 2013)

Merge r1503009 from trunk:

 * r1503009
   Short-circuit the UTF-8 conversion when the source encoding is UTF-8.
   Justification:
     Fixes svnsync_authz_tests.py 5 when apr_xlate_open() fails and
     --source-prop-encoding wasn't passed.  User complained.
   Votes:
     +1: danielsh, rhuijben, stefan2


r1503554 | svn-role | 2013-07-15 23:00:16 -0500 (Mon, 15 Jul 2013)

Merge the r1502909 group from trunk:

 * r1502909, r1502952
   Make ra_svn sessions reusable after a log callback uses the
   SVN_ERR_CEASE_INVOCATION error.
   Justification:
     Without this patch a new session would be required for each of these
     usages.
     Required by the r1468980 group.
   Notes:
     Reads the remaining data before returning, but avoids processing
     the data where possible.
   Votes:
     +1: rhuijben, danielsh, stefan2


r1503553 | svn-role | 2013-07-15 23:00:14 -0500 (Mon, 15 Jul 2013)

Merge r1502577 from trunk:

 * r1502577
   Change malfunctions to errors.
   Justification:
     There is no reason to invoke malfunction_handler in those failure modes.
   Votes:
     +1: danielsh, gstein, stefan2


r1503552 | svn-role | 2013-07-15 23:00:13 -0500 (Mon, 15 Jul 2013)

Merge the r1496007 group from trunk:

 * r1496007, r1496111
   Fix issue #4383, "Subversion 1.8.0 crash when WC path is symlink"
   Justification:
     Crash, regression from 1.7.
   Votes:
     +1: stsp, breser, stefan2
     +0: rhuijben (looks good)


r1501642 | svn-role | 2013-07-09 23:00:05 -0500 (Tue, 09 Jul 2013)

Merge r1495597 from trunk:

 * r1495597
   Fix a build warning, followup to already-merged r1493424.
   Justification:
     Makes the build warning-free (which in turn makes the bot useful).
   Votes:
     +1: danielsh, philip, rhuijben


r1501080 | svn-role | 2013-07-08 23:01:10 -0500 (Mon, 08 Jul 2013)

Merge the r1488693 group from trunk:

 * r1488693, r1490721, r1500904
   (Perl bindings) Documentation fixes: document some SVN::Client methods
   and at least list all wrapped -though still undocumented - methods.
   Justification:
     Save users from staring at the Perl source, trying to figure out
     what is wrapped.
   Votes:
     +1: breser
     +1: rschupp (without r1500904)
     +1: danielsh (r1488693, r1500904)
     +0: danielsh (r1490721)


r1501079 | svn-role | 2013-07-08 23:01:08 -0500 (Mon, 08 Jul 2013)

Merge the r1499034 group from trunk:

 * r1499034, r1500175
   sqlite3.m4: allow placing the amalgamation in the build dir.
   Justification:
     It is not present in the extracted source tarball, so doesn't belong in
     the source dir.
   Votes:
     +1: danielsh, breser, stefan2


r1501078 | svn-role | 2013-07-08 23:01:06 -0500 (Mon, 08 Jul 2013)

Merge r1500226 from trunk:

 * r1500226
   Fixes copyfrom URL construction in Ev2 commit editor shims.
   Justification:
     Makes Ev2 shims work for commit via (at least) ra_serf.
   Notes:
     See note under r1498885, above.
   Votes:
     +1: brane, breser, stefan2
      0: rhuijben (Ev2 shims aren't used by production code. (-0)
                   Only by JavaHL 1.7/1.8 extensions branch (+0))


r1501077 | svn-role | 2013-07-08 23:01:04 -0500 (Mon, 08 Jul 2013)

Merge the r1499438 group from trunk:

 * r1499438, r1499447, r1499460, r1500695, r1500928
   Make building with BDB 6 an opt-in feature.
   In configure, do not warn if BDB was not found.
   Justification (r1499447):
     The BDB backend is deprecated and the check is buggy.
   Justification (r1499438, r1499460):
     License change on a dependency.  libsvn_fs_base has not been tested with
     bdb6, and is deprecated so we are unlikely to test it.
   Notes:
     Two orthogonal changes that conflict with each other.
     r1499447 removes the warning.
     r1499438 and r1499460 add an opt-in
     r1500928 fixes the help string to be consistent with our convention
   Votes:
     +1: danielsh, breser, stefan2, stsp


r1501076 | svn-role | 2013-07-08 23:01:00 -0500 (Mon, 08 Jul 2013)

Remove the '1.8.x-r1495063' branch, merged in r1501075.

r1501075 | svn-role | 2013-07-08 23:00:44 -0500 (Mon, 08 Jul 2013)

Merge the 1.8.x-r1495063 branch:

 * ^/subversion/branches/1.8.x-r1495063
   r1495806, r1495985
   Fix crash in FSFS DAG caching code on strict-alignment architectures.
   Also, improve hash hash effectiveness and efficiency.
   Justification:
     FSFS shouldn't crash.
     See http://svn.haxx.se/dev/archive-2013-06/0432.shtml
   Branch: 1.8.x-r1495063
   Notes:
     It took a while to figure out the "right way" to fix the hash function.
     The branch takes all the individual back-and-forth changes and combines
     them into one small patch.
   Votes:
     +1: stefan2, stsp, breser


r1501074 | svn-role | 2013-07-08 23:00:43 -0500 (Mon, 08 Jul 2013)

Merge the r1499100 group from trunk:

 * r1499100, r1499483, r1499492, r1499496, r1499498
   Allow configuration files with an UTF-8 Byte Order Mark.
   Justification:
     Make it easier for users, particularly those on Windows using notepad,
     which will only save UTF-8 encoded text files with a BOM.
   Votes:
     +1: breser, stsp, danielsh


r1501073 | svn-role | 2013-07-08 23:00:41 -0500 (Mon, 08 Jul 2013)

Merge r1499064 from trunk:

 * r1499064
   Fix issue #4387, svn merge --record-only errors out on renamed path.
   Justification:
     Record-only merge shouldn't be flagging tree conflicts.
     Regression from 1.7.
   Votes:
     +1: stsp, rhuijben, breser


r1501072 | svn-role | 2013-07-08 23:00:40 -0500 (Mon, 08 Jul 2013)

Merge the r1495329 group from trunk:

 * r1495329, r1499403
   Fix symlink for svnmucc in svn-tools.
   Justification:
     Makes 'make install-tools' work when DESTDIR is set.
   Votes:
     +1: philip (without r1499403)
     +1: danielsh, stsp, breser


r1501071 | svn-role | 2013-07-08 23:00:38 -0500 (Mon, 08 Jul 2013)

Merge r1491756 from trunk:

 * r1491756
   Fix issue #4364: Correctly remove the stale entries from the lock table
   when committing deletions.
   Justification:
     Keep wc.db as consistent and clean as possible.
   Votes:
     +1: rhuijben, stsp, breser
     +1 (nonbinding): schabi


r1501070 | svn-role | 2013-07-08 23:00:36 -0500 (Mon, 08 Jul 2013)

Merge the r1491868 group from trunk:

 * r1491868, r1494657
   Add missing conflict callback invocations to the update editor.
   Justification:
     Resolver is not invoked after some updates which flag new tree conflicts.
   Votes:
     +1: stsp, rhuijben, breser


r1501069 | svn-role | 2013-07-08 23:00:35 -0500 (Mon, 08 Jul 2013)

Merge the r1498483 group from trunk:

 * r1498483, r1498484, r1498486
   fs: Improve a regression test.
   Notes:
     r1498483 adds a helper function.
     r1498484 extends the test to perform additional verifications, and
       switches it to a blacklist approach.
     r1498486 renames a local variable; no functional change.
   Justification:
     Makes the test more likely to exercise the bug.
   Votes:
     +1: danielsh, stefan2, breser
     -0: stsp (I don't really see a reason for backporting this.
               I don't think this test will ever find a regression in 1.8.x
               which we won't find on trunk. Having these changes in trunk
               is good of course.
               <danielsh>  Let's not assume that all bugs that occur in 1.8.x
               also occur in trunk; we have had counterexamples in our history.
               Agreed though that the crash fixers elsewhere in the file are
               more important to have.)


r1501068 | svn-role | 2013-07-08 23:00:33 -0500 (Mon, 08 Jul 2013)

Merge the r1500762 group from trunk:

 * r1500762, r1500799, r1500802
   Make gpg-agent password store verify that a usable GPG agent exists.
   Justification:
     gpg-agent password store might lie about having stored passwords
     which breaks password caching in the default configuration.
     See http://svn.haxx.se/users/archive-2013-07/0093.shtml
   Notes:
     r1500762 is the first part of the fix.
     r1500799 fixes the fix by not requiring GPG_TTY to be set (we cannot
              assume that GPG_TTY will always be set, but we can require
              a running agent).
     r1500802 fixes a build warning introduced in r1500799
   Votes:
     +1: stsp, danielsh, breser


r1501067 | svn-role | 2013-07-08 23:00:32 -0500 (Mon, 08 Jul 2013)

Merge r1500801 from trunk:

 * r1500801
   Don't require GPG_TTY and TERM when getting passwords from gpg-agent.
   Justification:
     Requiring those variables can prevent some gpg-agent setups from working.
     We cannot assume that everyone using gpg-agent is also using a TTY.
   Votes:
     +1: stsp, danielsh, rhuijben, breser


r1501066 | svn-role | 2013-07-08 23:00:31 -0500 (Mon, 08 Jul 2013)

Merge the r1498449 group from trunk:

 * r1498449, r1498455, r1498997
   kidney blame: convert a client segfault into a correct failure mode.  To
   reproduce run 'svn blame -r 2:1' against a 1.7 server with a 1.8.x binary.
   Notes:
     r1498449 breaks out a helper function
     r1498455 fixes the segfault.
     r1498997 is a minor optimisation
   Justification:
     Segfault.  (1.8.0 didn't have the segfaulting code.)
   Votes:
     +1: danielsh, stsp, rhuijben, breser


r1501065 | svn-role | 2013-07-08 23:00:29 -0500 (Mon, 08 Jul 2013)

Remove the '1.8.x-r1497310-partial' branch, merged in r1501064.

r1501064 | svn-role | 2013-07-08 23:00:13 -0500 (Mon, 08 Jul 2013)

Merge the 1.8.x-r1497310-partial branch:

 * r1497310
   Backport 'svn help cleanup' improvements made in r1497310.
   Justification:
     The current output doesn't explain what the command actually does.
   Branch: ^/subversion/branches/1.8.x-r1497310-partial
   Votes:
     +1: stsp, danielsh, stefan2, breser


r1501063 | svn-role | 2013-07-08 23:00:12 -0500 (Mon, 08 Jul 2013)

Merge r1498851 from trunk:

 * r1498851
   Provide an explicit error in the serf xml parser when the root element
   isn't matched in the transition table.
   Notes:
     This turns a class of previously invisible errors in an easy to diagnose
     error message.
   Votes:
     +1: rhuijben, gstein, ivan


r1501062 | svn-role | 2013-07-08 23:00:10 -0500 (Mon, 08 Jul 2013)

Merge r1500074 from trunk:

 * r1500074
   Format a path correctly in an error message.
   Justification:
     The error message includes a path not related to the working copy
   Votes:
     +1: danielsh, stsp, ivan


r1501061 | svn-role | 2013-07-08 23:00:09 -0500 (Mon, 08 Jul 2013)

Merge the r1491739 group from trunk:

 * r1491739, r1491755, r1491762, r1492152
   Improve interactive conflict resolution menu.
   Justification:
     The current menu is too hard to figure out for users.
     See http://svn.haxx.se/dev/archive-2013-06/0147.shtml
     and http://blog.elegosoft.com/?q=updating-moves-in-subversion-18-just-ask
   Votes:
     +1: stsp, danielsh, ivan


r1501060 | svn-role | 2013-07-08 23:00:08 -0500 (Mon, 08 Jul 2013)

Merge r1500680 from trunk:

 * r1500680
   Use local style for paths in error messages for 'svn diff --old A --new B'
   Justification:
     Errors show paths with wrong separators on some platforms.
   Votes:
     +1: stsp, danielsh, stefan2, breser


r1501059 | svn-role | 2013-07-08 23:00:06 -0500 (Mon, 08 Jul 2013)

Merge the r1491816 group from trunk:

 * r1491816, r1494089
   Add two additional options to interactive file merge.
   Justification:
     Usability enhancement for quicker conflict resolution in some cases.
     Very simple change. Only affects interactive mode, not scripts.
   Votes:
     +1: stsp, danielsh, stefan2


r1501058 | svn-role | 2013-07-08 23:00:05 -0500 (Mon, 08 Jul 2013)

Merge r1498885 from trunk:

 * r1498885
   Correctly initialize the node kind in the Ev2 shims' change table.
   Justification:
     Fixes a bug introduced bu the svn_kind_t -> svn_node_kind_t merge
     from r1455559, making the shims work again.
   Notes:
     I [brane] realise that this is an unusual backport request;
     the motivation is to make the JavaHL extensions backported to the
     javahl-1.8-extensions branch work with stock 1.8.x binary distros.
     Incidentally, that backport will serve as a real-life test of the
     Ev2 API, as that is what JavaHL exposes.
   Votes:
      +1: brane, gstein, stsp


r1500572 | svn-role | 2013-07-07 23:00:57 -0500 (Sun, 07 Jul 2013)

Merge r1487094 from trunk:

 * r1487094
   (Perl bindings) Silence compiler warnings.
   Justification:
     Clean builds make it more likely to notice real compiler warnings.
   Votes:
     +1: rschupp, danielsh


r1499910 | svn-role | 2013-07-04 23:00:57 -0500 (Thu, 04 Jul 2013)

Merge r1492264 from trunk:

 * r1492264
   Fix wrong character encoding handling of generic error messages
   in JavaHL
   Justification:
     Fixes a confusing bug where the generic error message generated by
     JavaHL is mangled due to wrong encoding, but the more specific messages
     generated by the native libraries are legible.
   Votes:
     +1: brane, philip


r1499909 | svn-role | 2013-07-04 23:00:55 -0500 (Thu, 04 Jul 2013)

Merge the r1499095 group from trunk:

 * r1499095, r1499096
   Fix issue #4388, crash during tree conflict resolution.
   Justification:
     Segfault can be triggered by sequence of client commands (see issue).
     Regression from 1.7.
   Notes:
     r1499095 fixes the crash shown in the issue.
     r1499096 should prevent a similar problem, found by code inspection.
   Votes:
      +1: stsp, gstein, philip


r1499908 | svn-role | 2013-07-04 23:00:54 -0500 (Thu, 04 Jul 2013)

Merge the r1498550 group from trunk:

 * r1498550, r1499727
   ra_svn: Fix client-triggerable client segfault upon commit.
   Justification:
     Segfault.  ra_local and ra_serf permit the commit.
   Votes:
     +1: danielsh, stefan2, philip


r1499196 | svn-role | 2013-07-02 23:00:58 -0500 (Tue, 02 Jul 2013)

Merge the r1493703 group from trunk:

 * r1493703, r1494171
   Fix upgrade notification for explicit upgrades of post-WC-NG working copies.
   Justification:
     Without this notification users can't see whether the upgrade was a no-op.
   Votes:
     +1: rhuijben, stsp, danielsh


r1499195 | svn-role | 2013-07-02 23:00:56 -0500 (Tue, 02 Jul 2013)

Merge r1497002 from trunk:

 * r1497002
   Avoid temporary files when calling external diff. Fixes issue 4382.
   Justification:
     Regression from 1.7.
   Votes:
     +1: philip, stsp, rhuijben


r1499194 | svn-role | 2013-07-02 23:00:55 -0500 (Tue, 02 Jul 2013)

Merge r1496957 from trunk:

 * r1496957
   Eliminate an extra RA layer roundtrip in 'svn log' on repository roots.
   Justification:
     Minor performance regression against 1.7.x plus requesting e.g. single
     revision logs on a repo root is not a fringe use-case.
   Votes:
     +1: stefan2, stsp, rhuijben


r1499193 | svn-role | 2013-07-02 23:00:54 -0500 (Tue, 02 Jul 2013)

Merge r1498564 from trunk:

 * r1498564
   Allow the new in 1.8 move metadata only to work properly when the
   target of the move already exists as unversioned node.
   Justification:
     The metadata only option was added especially to allow fixing up
     of already performed moves.
   Votes:
     +1: rhuijben, philip, stsp, stefan2


r1499192 | svn-role | 2013-07-02 23:00:52 -0500 (Tue, 02 Jul 2013)

Merge r1498136 from trunk:

 * r1498136
   Disable named atomics if APR does not implement memory-mapped files.
   Justification:
     People still use Subversion on platforms where mmap is not available.
   Votes:
     +1: brane, rhuijben, stefan2


r1499191 | svn-role | 2013-07-02 23:00:51 -0500 (Tue, 02 Jul 2013)

Merge r1498456 from trunk:

 * r1498456
   ra_serf: recognize the get-file-revs-reverse capability.
   Justification:
     Wrong failure mode: the code raised an error when it should have replied
     FALSE with no error.
   Votes:
     +1: danielsh, rhuijben, stefan2


r1498772 | svn-role | 2013-07-01 23:00:50 -0500 (Mon, 01 Jul 2013)

Merge r1497804 from trunk:

 * r1497804
   sqlite error messages: change location of sqlite numeric error code.
   Justification:
     Make it clearer that 'S26' is an error code, rather than a parenthetical
     description of the last word in the string sqlite3_errmsg() returned.
   Votes:
     +1: danielsh, stefan2, rhuijben


r1498212 | svn-role | 2013-06-30 23:00:50 -0500 (Sun, 30 Jun 2013)

Merge r1497319 from trunk:

 * r1497319
   Better explain exclusive-commit locks in 'svn help status' output.
   Justification:
     The current documentation can be misleading for users who might not
     know what a 'lock token' is, or what the purpose of the lock is.
   Votes:
     +1: stsp, brane, stefan2


r1498060 | svn-role | 2013-06-29 23:01:07 -0500 (Sat, 29 Jun 2013)

Merge r1497318 from trunk:

 * r1497318
   Better explain working copy locks in 'svn help status' output.
   Justification:
     The current documentation can be misleading for users who might
     not know what the purpose of the lock is.
   Votes:
     +1: stsp, brane, stefan2


r1497641 | svn-role | 2013-06-27 23:00:45 -0500 (Thu, 27 Jun 2013)

Merge r1497551 from trunk:

 * r1497551
   Fix the Accept-Encoding header format
   Justification:
     When IIS is used as a reverse-proxy, it chokes. And we should use the
     format from the specification anyways :-P
   Votes:
     +1: gstein, brane, danielsh


r1497206 | svn-role | 2013-06-26 23:00:44 -0500 (Wed, 26 Jun 2013)

Merge the r1491432 group from trunk:

 * r1491432, r1496938
   Rename 'automatic merge' to 'complete merge' in the merge help text.
   Justification:
     Prevent user confusion. "Automatic merge" sounds too ambitious and
     may be misunderstood if not used in context. The term 'complete'
     refers to a merge which merges all outstanding changes from the
     source branch, i.e. sync or reintegrate.
   Notes:
     This was not merged in time for 1.8.0, so different client
     versions will name the feature in different ways.
     r1496938 just tweaks "an 'complete' merge" to "a 'complete' merge".
   Votes:
     +1: stsp
     +1: danielsh (no opinion on the name of the feature; just confirming this
                   patch does what it claims to)
     +1: julianfoad


r1496728 | svn-role | 2013-06-25 23:00:53 -0500 (Tue, 25 Jun 2013)

Merge the r1495432 group from trunk:

 * r1495432, r1495446
   Allow deleting non-regular properties from nodes.
   Justification:
     No way to remove them from historical files that have them.
   Votes:
     +1: stsp, danielsh, stefan2


r1496727 | svn-role | 2013-06-25 23:00:51 -0500 (Tue, 25 Jun 2013)

Merge r1496110 from trunk:

 * r1496110
   Prevent a segfault in svn_client_log5.
   Justification:
     No command line replication yet, but several reports of segfaults
    with TSVN, see http://svn.haxx.se/dev/archive-2013-06/0522.shtml.
   Votes:
     +1: pburba, stsp, ivan


r1496726 | svn-role | 2013-06-25 23:00:50 -0500 (Tue, 25 Jun 2013)

Merge the r1496132 group from trunk:

 * r1496132, r1496151
   Provide a more detailed error than APR_EGENERAL when a serf connection
   fails.
   Justification:
     Returning APR_EGENERAL for a very common error breaks all usable
     error handling in GUI clients. Serf should provide a better
     error that differentiates between separate problems.
   Votes:
     +1: rhuijben, stsp, danielsh


r1496725 | svn-role | 2013-06-25 23:00:48 -0500 (Tue, 25 Jun 2013)

Merge r1495428 from trunk:

 * r1495428
   Improve BDB error codes.
   Justification:
     (err->apr_err == APR_SUCCESS) leaks to API consumers.
   Votes:
     +1: danielsh, stefan2, stsp


r1496724 | svn-role | 2013-06-25 23:00:46 -0500 (Tue, 25 Jun 2013)

Merge the r1494913 group from trunk:

 * r1494913, r1494967
   Fix performance regression in 'svn log' on repository roots.
   Justification:
     In 1.8.0, 'svn log' is unusably slow on FSFS repo roots.
     BDB most likely has the same issue.
   Note:
     r1494913 fixes FSFS
     r1494967 fixes BDB
   Votes:
     +1: stefan2, danielsh, stsp


r1496723 | svn-role | 2013-06-25 23:00:44 -0500 (Tue, 25 Jun 2013)

Merge the r1478987 group from trunk:

 * r1478987, r1492020
   Optimize some code that retrieves mergeinfo to obtain less unneeded
   information from the repository.
   Justification:
     Simple fixes to improve performance.
   Votes:
     +1: rhuijben, stefan2, stsp


r1495921 | svn-role | 2013-06-23 23:00:46 -0500 (Sun, 23 Jun 2013)

Merge r1495850 from trunk:

 * r1495850
   Use the correct baton in a callback API.
   Justification:
     Causes a crash in TSVN reported by multiple users.
     See: http://svn.haxx.se/dev/archive-2013-06/0543.shtml
   Votes:
     +1: lgo, danielsh, stefan2


r1495920 | svn-role | 2013-06-23 23:00:44 -0500 (Sun, 23 Jun 2013)

Merge r1491707 from trunk:

 * r1491707
   Add version header to svnpubsub server.
   Justification:
     Make Daniel happy; potentially allow proxies to filter on this or some
     hypothetical use case.
   Votes:
     +1: danielsh, breser, stefan2


r1495919 | svn-role | 2013-06-23 23:00:43 -0500 (Sun, 23 Jun 2013)

Merge r1490684 from trunk:

 * r1490684
   Return 500 rather than 409 when commit fails and it is not a conflict.
   Justification:
     Not a client failure so 4xx is wrong.
   Votes:
     +1: philip, rhuijben, stefan2


r1495918 | svn-role | 2013-06-23 23:00:41 -0500 (Sun, 23 Jun 2013)

Merge r1489339 from trunk:

 * r1489339
   Return 501/412 rather than 401 for lock errors.
   Justification:
     Old values are not valid HTTP.
   Notes:
     Usually the authorization layer produces an error earlier. This patch
     should only change the behavior for repositories without authorization
     requirements for these operations.
   Votes:
     +1: philip, rhuijben, stefan2


r1495917 | svn-role | 2013-06-23 23:00:40 -0500 (Sun, 23 Jun 2013)

Merge the r1480080 group from trunk:

 * r1480080, r1481772, r1481847
   Instruct clang to not warn about unknown warning flags.
   Justification:
     Newer versions of clang accept warning flags that they do not
     support, but emit warnings about them instead -- making the
     compile output a mess with a warning emitted for every
     single C and C++ file in an optimized build (because
     of the -Wno-clobbered, see above).
   Votes:
     +1: brane, danielsh
     +1: stefan2 (despite a minor  "maintainer"->"maintanier" typo)
     +0: rhuijben (looks ok, but I can't test or verify via code inspection)


r1495282 | svn-role | 2013-06-20 23:00:42 -0500 (Thu, 20 Jun 2013)

Merge r1493424 from trunk:

 * r1493424
   Remove unnecessary check for branches ancestry from 
   command line client. All required checks are already performed in
   libsvn_client.
   Justification:
     There is no reason to command line and third-party use different
     codepath for ancestory checks. Simple performance fix.
   Votes:
     +1: ivan, rhuijben, julianfoad
     +0: danielsh (note: svn_client__youngest_common_ancestor can be striken;
                         no callers left)


r1495281 | svn-role | 2013-06-20 23:00:41 -0500 (Thu, 20 Jun 2013)

Merge r1495104 from trunk:

 * r1495104
   Handle unexpected HTTP status codes as errors instead of as SUCCESS codes
   in ra_serf.
   Justification:
     Handling them as success values causes assertions.
   Votes:
     +1: rhuijben, ivan, philip


r1495280 | svn-role | 2013-06-20 23:00:39 -0500 (Thu, 20 Jun 2013)

Merge r1494342 from trunk:

 * r1494342
   C tests: support --compatible-version=1.8.
   Justification:
     Enable running the tests with --compatible-version
   Votes:
     +1: danielsh, rhuijben, stefan2


r1495279 | svn-role | 2013-06-20 23:00:38 -0500 (Thu, 20 Jun 2013)

Merge r1493475 from trunk:

 * r1493475
   Improve 'svn merge' performance over WAN: Use already fetched 
   history-as-mergeinfo data to find youngest common ancestor in automatic 
   merge.
   Justification:
     No reason to create an RA session or perform RA calls if the information
     is already in memory.
   Votes:
     +1: rhuijben, ivan, stefan2


r1495278 | svn-role | 2013-06-20 23:00:36 -0500 (Thu, 20 Jun 2013)

Merge the r1492148 group from trunk:

 * r1492148, r1493720
   Don't try to use 'blame -r 5:1' against 1.7 servers.  Affects only users
   of the RA API, not users of the client API or svn.
   Justification:
     1.7 servers would silently do the wrong thing.
   Votes:
     +1: danielsh, rhuijben, stefan2


r1494851 | svn-role | 2013-06-19 23:00:37 -0500 (Wed, 19 Jun 2013)

Merge r1494223 from trunk:

 * r1494223
   Forbid 'svnadmin create --fs-type=fsfs --compatible-version=1.0'.
   Justification:
     Well, I hope no one will actually run into this error in a situation
     where it matters, but I'll sleep better knowing we're strict about
     input validation.
   Votes:
     +1: danielsh, rhuijben, stsp


r1494850 | svn-role | 2013-06-19 23:00:36 -0500 (Wed, 19 Jun 2013)

Merge the r1494298 group from trunk:

 * r1494298, r1494318
   Fix a FSFS data loss when aborting 'svnadmin upgrade' late in the process.
   Justification:
     This is a critical issue. People may actually abort the potentially long-
     running 'svnadmin upgrade'.  If they do that after the actual packing
     phase, they *will* lose data.
     r1494318 is a follow-up that fixes a copy'n'pasto.
   Notes:
     Depends on r1494287 which must be merged first.
   Votes:
     +1: stefan2, danielsh, ivan


r1494849 | svn-role | 2013-06-19 23:00:35 -0500 (Wed, 19 Jun 2013)

Merge r1494287 from trunk:

 * r1494287
   Fix a "div-by-0" error when upgrading unsharded format 3+ FSFS repositories.
   Justification:
     Even if the format supports sharding, the actual repo may be unsharded.
     The upgrade code simply needs to check for that condition and skip revprop
     catch-up packing in that case.
   Votes:
     +1: stefan2, danielsh, ivan, philip


r1494441 | svn-role | 2013-06-18 23:00:40 -0500 (Tue, 18 Jun 2013)

Merge r1493951 from trunk:

 * r1493951
   Fix 'svn-bench' misreporting itself as 'svn'.
   Justification:
     Misleading output, pretty obvious fix.
   Votes:
     +1: stsp, danielsh, rhuijben


r1494440 | svn-role | 2013-06-18 23:00:39 -0500 (Tue, 18 Jun 2013)

Merge r1492164 from trunk:

 * r1492164
   Invalid repository paths cause a segfault in the fsfs-stats tool.
   Justification:
     Don't segfault.
   Votes:
     +1: stefan2, stsp, danielsh


r1494439 | svn-role | 2013-06-18 23:00:38 -0500 (Tue, 18 Jun 2013)

Merge r1492295 from trunk:

 * r1492295
   Fix swig-rb tests with out-of-tree builds.
   Justification:
     Our tests should not be broken, regression in 1.8.0 from previous versions
   Votes:
     +1: breser
     +0: danielsh


r1494438 | svn-role | 2013-06-18 23:00:36 -0500 (Tue, 18 Jun 2013)

Merge r1492005 from trunk:

 * r1492005
   Optimize 'svn mergeinfo --show-revs' network usage.
   Justification:
     Simple fixes to improve performance.
   Votes:
     +1: ivan, rhuijben, danielsh


r1494437 | svn-role | 2013-06-18 23:00:35 -0500 (Tue, 18 Jun 2013)

Merge r1491770 from trunk:

 * r1491770
   Eliminate revprop buffer size limit.
   Justification:
     This removes an inconsistency; we don't limit object sizes anywhere
     else. Particularly, we allowed for unlimited revprop sizes when setting
     them but had a 16MB limit in the getter.
   Votes:
     +1: stefan2, blair, danielsh


r1494436 | svn-role | 2013-06-18 23:00:33 -0500 (Tue, 18 Jun 2013)

Merge r1492145 from trunk:

 * r1492145
   Properly handle a corner case in svn_io_read_length_line().
   Justification:
     Don't get in an endless loop when repos/db/uuid contains a \r\n instead
     of a \n. (Some testcode of one user got in this case by applying a hack
     and it worked in 1.7)
   Votes:
     +1: rhuijben, ivan, stefan2


r1492044 | svn-role | 2013-06-11 23:00:30 -0500 (Tue, 11 Jun 2013)

Merge r1490679 from trunk:

 * r1490679
   Allow test suite to run properly on Windows.
   Justification:
     Fixes a (very) minor test setup failure when running the ra_serf tests on
     Windows for the first time in a given environment.
   Votes:
     +1: pburba, rhuijben, ivan


r1491685 | svn-role | 2013-06-10 23:00:26 -0500 (Mon, 10 Jun 2013)

Merge r1405922 from trunk:

 * r1405922
   Fix bug in error-constructing code in JavaHL.
   Justification:
     Bug that seems to be related to spurious JavaHL test failures I'm seeing,
     where absolute paths are passed into svn_relpath_dirname().
     Could cause worse issues such as abort() crashing Eclipse. Simple fix.
   Votes:
     +1: stsp, rhuijben


r1489702 | svn-role | 2013-06-04 23:01:01 -0500 (Tue, 04 Jun 2013)

Merge r1488183 from trunk:

 * r1488183
   Check target WC for mixed revisions, local modifications and switched
   subtrees before contacting server for merge calculations.
   Justification:
     Merge calculations can easy take 10 seconds over WAN, while mixed
     revisions working copy are common. Small fix.
   Votes:
     +1: ivan, philip, julianfoad


r1489701 | svn-role | 2013-06-04 23:00:55 -0500 (Tue, 04 Jun 2013)

Merge r1488425 from trunk:

 * r1488425
   Fix issue 4369, poor serf error message for commit with stolen locks.
   Justification:
     Confusing to user and a regression from 1.7/neon.
   Votes:
     +1: philip, rhuijben, ivan
     +0: danielsh


r1489700 | svn-role | 2013-06-04 23:00:50 -0500 (Tue, 04 Jun 2013)

Merge r1488878 from trunk:

 * r1488878
   Don't leave return value uninitialised.
   Justification:
     Possible SEGV when using legacy status API.
   Votes:
     +1: philip, brane, rhuijben

r1489699 | svn-role | 2013-06-04 23:00:36 -0500 (Tue, 04 Jun 2013)

Merge r1489203 from trunk:

 * r1489203
   Fix a crash when the automatic merge API is called with unrelated source
   and target branches, other than by 'svn' which does an ancestry check
   before calling it.  Also affected svn_client_get_merging_summary().
   Justification:
     It's a crash. The fix is a straightforward check.
   Notes:
     Tested as in the email: by temporarily removing the check at
     merge-cmd.c:109 and trying a mismatched automatic merge.
   Votes:
     +1: julianfoad, ivan, pburba


r1489698 | svn-role | 2013-06-04 23:00:25 -0500 (Tue, 04 Jun 2013)

Merge the r1489114 group from trunk:

 * r1489114, r1489116
   Require Serf 1.2.1.
   Justification:
     Serf 1.2.0 doesn't work where Digest authentication is in use.
     See http://subversion.tigris.org/issues/show_bug.cgi?id=4371 and
     https://code.google.com/p/serf/issues/detail?id=102 for details.
   Notes:
     This is a blocking issue.
   Votes:
     +1: cmpilato, gstein, ivan


r1489697 | svn-role | 2013-06-04 23:00:21 -0500 (Tue, 04 Jun 2013)

[Reverted in r1489790]

Merge r1488878 from trunk:

 * r1488878
   Don't leave return value uninitialised.
   Justification:
     Possible SEGV when using legacy status API.
   Votes:
     +1: philip, brane, rhuijben


r1489282 | svn-role | 2013-06-03 23:00:15 -0500 (Mon, 03 Jun 2013)

Merge the r1483575 group from trunk:

 * r1483575, r1483580, r1485018
   Define SVN_UNALIGNED_ACCESS_IS_OK for PowerPC.
   Justification:
     Performance for free.
   Votes:
     +1: mattiase (non-binding, not including r1485018)
     +1: breser, stefan2, rhuijben


r1488642 | svn-role | 2013-06-01 23:00:11 -0500 (Sat, 01 Jun 2013)

Merge r1488267 from trunk:

 * r1488267
   Fix issue #4370 '(m)erge interactive conflict resolution segfaults when cwd
   not parent of target'.
   Justification:
     Prevents a segfault in the new 'internal text conflict merge tool'.
   Votes:
     +1: pburba (for 1.8.0:  This isn't a 'destabilizing' change per my
                 reading of our release-stabilization guidelines, so it can
                 be included in 1.8.0 without a soak restart.)
     +1: rhuijben, danielsh


r1487719 | svn-role | 2013-05-29 23:00:36 -0500 (Wed, 29 May 2013)

Merge r1485127 from trunk:

 * r1485127
   Revert 1.8 behavior change that breaks some url forms when passed to
   ra_local. Without this some existing working copies using non standard
   urls to access the repository might be broken.
   Justification:
     Restores functionality that was lost in 1.8 compared to 1.7.
   Votes:
     +1: rhuijben (for 1.8.1 or soak restart), danielsh, cmpilato


r1487718 | svn-role | 2013-05-29 23:00:33 -0500 (Wed, 29 May 2013)

Remove the '1.8.x-r1477876' branch, merged in r1487717.

r1487717 | svn-role | 2013-05-29 23:00:17 -0500 (Wed, 29 May 2013)

Merge the 1.8.x-r1477876 branch:

 * r1477876, r1477891, r1478001, r1479605
   Fix a bug whereby a property conflict description always reported
     'unknown' for the node kind. Add a test which catches that bug.
   Justification:
     Regression from 1.7.
   Branch: ^/subversion/branches/1.8.x-r1477876
   Notes:
     The fix is in r1477876, and the branch was needed to resolve conflicts
     (rather than porting prior changes on which it depended). The test is
     in r1478001, and it depends on the test file changes made in r1477891.
     r1479605 fixes an interactive conflict resolution bug triggered by this
     change.
   Votes:
     +1: julianfoad, stsp, cmpilato


r1487716 | svn-role | 2013-05-29 23:00:13 -0500 (Wed, 29 May 2013)

Merge the r1479563 group from trunk:

 * r1479563, r1480119, r1487083
   Make svn_client_log5() callable from the Perl bindings.
   Justification:
     1.6 API that wasn't wrapped yet.
   Votes:
     +1: breser, rschupp


r1487715 | svn-role | 2013-05-29 23:00:09 -0500 (Wed, 29 May 2013)

Merge r1479540 from trunk:

 * r1479540
   Add an in typemap for PROPHASH to the Perl bindings.
   Justification:
     Make it easier to use APIs that take hashes of properties as input.
   Votes:
     +1: breser, rschupp


r1487227 | svn-role | 2013-05-28 23:00:16 -0500 (Tue, 28 May 2013)

Merge r1486809 from trunk:

 * r1486809
   svnpubsub: fix MIME type of response.
   Justification:
     Be friendly to generic MIME/HTTP clients.
   Votes:
     +1: danielsh, brane, breser


r1487226 | svn-role | 2013-05-28 23:00:13 -0500 (Tue, 28 May 2013)

Merge r1486915 from trunk:

 * r1486915
   Provide APR_BUFFERED flag when opening file in svn patch.
   Justification:
     One-line fix to dramatically improve svn patch performance. Without
     this fix applying 27 KB patch takes minutes.
   Votes:
     +1: ivan, stsp, danielsh, philip


r1487225 | svn-role | 2013-05-28 23:00:11 -0500 (Tue, 28 May 2013)

Merge the r1480344 group from trunk:

 * r1480344, r1480412, r1480442, r1480738, r1480765, r1482479, r1482524,
   r1482528, r1482536, r1486931
   Fix Ruby binding tests on Windows and support Ruby 1.9[1].
   Justification:
     Running the test suite is important for, you know, testing.
   Notes:
     Bindings changes, so can go into 1.8.0.  [1] Ruby 1.9 doesn't quite
     yet work on Windows, but this gets us part way there, so there is no
     compelling reason not to include with this bunch.
   Votes:
     +1: pburba
     +0: danielsh


r1486733 | svn-role | 2013-05-27 23:00:11 -0500 (Mon, 27 May 2013)

Merge r1486457 from trunk:

 * r1486457
   svnpubsub: make the example commit hook work with 1.8 libsvn_repos.
   Justification:
     Examples should work.
   Votes:
     +1: brane (via dev@), breser, danielsh


r1486509 | svn-role | 2013-05-26 23:01:46 -0500 (Sun, 26 May 2013)

Merge the r1485447 group from trunk:

 * r1485447, r1485449
   Make 'SQLITE_VERSION=3.7.15.1 ./get-deps.sh' work.
   Justification:
     Allow downloading another version without editing the script, for example
     if upstream break the URL to the tarball after a newer version has been
     released.
   Votes:
     +1: danielsh, cmpilato, stefan2


r1486508 | svn-role | 2013-05-26 23:01:42 -0500 (Sun, 26 May 2013)

Merge r1480149 from trunk:

 * r1480149
   Fix a build problem on OS X 10.5.
   Justification:
     Necessary for building on PPC Macs.
   Votes:
     +1: mattiase (non-binding)
     +1: rhuijben, breser, stefan2


r1486507 | svn-role | 2013-05-26 23:01:39 -0500 (Sun, 26 May 2013)

Merge r1482436 from trunk:

 * r1482436
   Resolve regression in svn_ra_replay_range() where it didn't apply
   the send_changes FALSE flag to property changes.
   Justification:
     The replay without changes mode is used by repository viewers
     to obtain more information about changes. We should keep this
     behavior stable
   Votes:
     +1: rhuijben (for either 1.8.0 or later)
     +1: cmpilato, danielsh


r1486506 | svn-role | 2013-05-26 23:01:38 -0500 (Sun, 26 May 2013)

Merge r1483781 from trunk:

 * r1483781
   Fix FSFS repository corruption on power or network disk failure on Windows:
   http://svn.haxx.se/dev/archive-2013-05/0245.shtml
   Justification:
     Repository corruption. Regression from 1.6.x
   Votes:
     +1: ivan, blair, danielsh


r1486287 | svn-role | 2013-05-24 23:01:45 -0500 (Fri, 24 May 2013)

Merge r1483557 from trunk:

 * r1483557
   Match our revision property names exactly instead of by prefix only.
   Justification:
     While the impact of this bug is certainly low, it is still an easy
     to fix problem.
   Votes:
     +1: stefan2 (for 1.8.1), rhuijben, pburba


r1486286 | svn-role | 2013-05-24 23:01:43 -0500 (Fri, 24 May 2013)

Merge r1481944 from trunk:

 * r1481944
   Let Windows compile against BDB 5.0, 5.1, 5.2 and 5.3.
   Justification:
     No reason to prevent this.
   Votes:
     +1: breser (for 1.8.1), pburba, cmpilato


r1486285 | svn-role | 2013-05-24 23:01:41 -0500 (Fri, 24 May 2013)

Merge r1486072 from trunk:

 * r1486072
   Fix expansion of custom keywords with values that contain '='.
   Justification:
     Custom keyword values containing '=' should work.
   Votes:
     +1: stsp, danielsh, cmpilato


r1486284 | svn-role | 2013-05-24 23:01:38 -0500 (Fri, 24 May 2013)

Merge r1485650 from trunk:

 * r1485650
   Convert svnadmin notifications from UTF8 to native encoding.
   Justification:
     Non-UTF8 locales can see garbled output.
   Votes:
     +1: philip, rhuijben, cmpilato


r1486283 | svn-role | 2013-05-24 23:01:35 -0500 (Fri, 24 May 2013)

Merge the r1483125 group from trunk:

 * r1483125, r1483555, r1483927, r1483947
   Fix issue #4367 'merge to shallow WC, repeat merge to infinite depth WC is
   broken'.
   Justification:
     Edge case merge can result in incorrect WC state which cannot be
     committed.
   Notes:
     r1483125, r1483555, and r1483927 are a test and some subsequent tweaks
     for the issue.  r1483947 is the fix proper. 
   Votes:
     +1: pburba, rhuijben, cmpilato


r1485366 | svn-role | 2013-05-22 14:33:22 -0500 (Wed, 22 May 2013)

Merge r1465975 from trunk:

 * r1465975
   Replace assertions that trigger in the wild with proper error messages.
   Justification:
     User-friendliness, see http://svn.haxx.se/users/archive-2013-04/0064.shtml
     Showing the problematic path will help with figuring out the problem.
   Votes:
     +1: stsp, breser
     +1: danielsh (should we avoid svn_dirent_local_style in this case, i.e.,
                   print the literal value that nodes.local_relpath is expected
                   to contain?)


r1485365 | svn-role | 2013-05-22 14:33:20 -0500 (Wed, 22 May 2013)

Merge r1452780 from trunk:

 * r1452780
   Address issue #4331, "working copy permissions change on commit for files
   with keywords".
   Justification:
     Keyword translation should not affect file permission bits.
   Votes:
     +1: stsp, breser, danielsh
     +0: rhuijben (code looks ok, but is a no-op on Windows)


r1485364 | svn-role | 2013-05-22 14:33:17 -0500 (Wed, 22 May 2013)

Merge r1434750 from trunk:

 * r1434750
   Resolve regression in 'svn status -u' output when running on externals.
   Without this patch the paths in directory externals are shown as absolute
   while all others are shown relative/as provided by the user.
   Justification:
     Consistent api behavior is good
   Votes:
     +1: rhuijben, stsp, breser


r1485363 | svn-role | 2013-05-22 14:33:16 -0500 (Wed, 22 May 2013)

Merge the r1434128 group from trunk:

 * r1434128, r1434435, r1434476
   Fix issue #4034, 'blame on files with non-native eol-style sees every
   line as modified'.
   Justification:
     When blaming to the working copy instead of the base version eol styles
     all other styles than those with "\n" repository form show up as
     entirely changed.
   Votes:
     +1: rhuijben, stsp, breser


r1485362 | svn-role | 2013-05-22 14:33:13 -0500 (Wed, 22 May 2013)

Merge the r1421541 group from trunk:

 * r1421541, r1424977
   Fix infinite recursion in './get-deps.sh'.
   Justification:
     Trivial fix to plug an edge case.
   Votes:
     -0: rhuijben (Is this needed on this branch?)
     +1: breser, stsp, danielsh (as much as it's needed on trunk)


r1485056 | svn-role | 2013-05-21 23:02:34 -0500 (Tue, 21 May 2013)

Remove the '1.8.x-libsvnjavahl-version' branch, merged in r1485055.

r1485055 | svn-role | 2013-05-21 23:02:19 -0500 (Tue, 21 May 2013)

Merge the 1.8.x-libsvnjavahl-version branch:

 * r1483913
   Fix hard-coded version in JavaHL's JNI loader.
   Justification:
     We don't want to try to use the 1.7 libraries.
   Branch: ^/subversion/branches/1.8.x-libsvnjavahl-version
   Votes:
     +1: philip, rhuijben, breser


r1485054 | svn-role | 2013-05-21 23:02:17 -0500 (Tue, 21 May 2013)

Merge r1483116 from trunk:

 * r1483116
   Retry removing test temporary directories when running as deferred deletes
   using a short delay.
   Justification:
     Without this patch running the svnserve-bdb tests on Windows leaves a lot
     of temporary directories behind, causing testruns to fail on ramdrives.
   Votes:
     +1: rhuijben, pburba, breser


r1485053 | svn-role | 2013-05-21 23:02:16 -0500 (Tue, 21 May 2013)

Merge r1482829 from trunk:

 * r1482829
   Reduce diskspace needed by our testsuite when using cleanup mode.
   Justification:
     A 256 MB ramdrive should be more than enough for running the
     tests in parallel mode, but currently isn't.
   Votes:
     +1: rhuijben, pburba, breser


r1485052 | svn-role | 2013-05-21 23:02:15 -0500 (Tue, 21 May 2013)

Merge the r1483391 group from trunk:

 * r1483391, r1483397
   Fix 'svn diff' erroring out on missing tree conflict victims.
   Justification:
     Regresion from 1.7.
   Votes:
     +1: stsp, rhuijben, pburba


r1485051 | svn-role | 2013-05-21 23:02:13 -0500 (Tue, 21 May 2013)

Merge r1484755 from trunk:

 * r1484755
   Fix SVN_ERR_ASSERT macro to provide failed expression, instead of
   evaluated value when compiled using Visual Studio 2010.
   Justification:
     Assertions diagnostic is important. Regression from 1.7.x.
   Votes:
     +1: ivan, cmpilato, pburba


r1485050 | svn-role | 2013-05-21 23:02:11 -0500 (Tue, 21 May 2013)

Merge r1482724 from trunk:

 * r1482724
   Fix a link error when configured with --enable-runtime-module-search.
   Justification:
     Build fails.
   Votes:
     +1: philip, rhuijben, stsp, breser


r1485049 | svn-role | 2013-05-21 23:02:10 -0500 (Tue, 21 May 2013)

Merge the r1482759 group from trunk:

 * r1482759, r1482779
   Prevent svnserve from exiting when a client connection is aborted.
   Justification:
     DoS against svnserve possible.
   Votes:
     +1: stsp, rhuijben, philip, breser


r1485048 | svn-role | 2013-05-21 23:02:07 -0500 (Tue, 21 May 2013)

Remove the '1.7.x-r1482759' branch, merged in r1485047.

r1485047 | svn-role | 2013-05-21 23:01:52 -0500 (Tue, 21 May 2013)

Merge the 1.7.x-r1482759 branch:

 * r1482759, r1482779 
   Prevent svnserve from exiting when a client connection is aborted.
   Justification:
     DoS against svnserve possible.
   Branch:
     ^/subversion/branches/1.7.x-r1482759
   Votes:
     +1: stsp, breser, philip


r1485046 | svn-role | 2013-05-21 23:01:48 -0500 (Tue, 21 May 2013)

Remove the '1.6.x-r1482759' branch, merged in r1485045.

r1485045 | svn-role | 2013-05-21 23:01:32 -0500 (Tue, 21 May 2013)

Merge the 1.6.x-r1482759 branch:

 * r1482759, r1482779 
   Prevent svnserve from exiting when a client connection is aborted.
   Justification:
     DoS against svnserve possible.
   Branch:
     ^/subversion/branches/1.6.x-r1482759
   Votes:
     +1: breser, stsp, philip


r1483187 | svn-role | 2013-05-15 23:01:28 -0500 (Wed, 15 May 2013)

Merge r1482973 from trunk:

 * r1482973
   Avoid using predictable temporary filenames based on "tempfile".
   Justification:
     Performance issue if lots of files match.
   Votes:
     +1: philip, rhuijben, cmpilato


r1483186 | svn-role | 2013-05-15 23:01:25 -0500 (Wed, 15 May 2013)

Merge the r1482969 group from trunk:

 * r1482969, r1482970
   Fix issue #4366 ("client SEGFAULTs diffing a repos rev in which an
   empty file was added").
   Justification:
     SEGFAULTs are consider rude in polite company.
   Votes:
     +1: cmpilato, philip, rhuijben


r1482668 | svn-role | 2013-05-14 23:01:24 -0500 (Tue, 14 May 2013)

Merge the r1482554 group from trunk:

 * r1482554, r1482592
   Making ctypes-python tests pass regardless of local timezone.
   Justification:
     Tests should not give false negatives.
   Notes:
     Bindings change so can go into 1.8.0.
   Votes:
     +1: breser, danielsh


r1482197 | svn-role | 2013-05-13 23:02:48 -0500 (Mon, 13 May 2013)

Merge the r1434405 group from trunk:

 * r1434405, r1434414, r1434418
   Fix issue #4294 'diff --git shows wrong copy from'.  Moving a dir
   causes diff --git to output incorrect sources for the diff.
   Justification:
     Diff should show the correct output.  Failiure to do so can lead to
     incorrect interoperation with other systems.
   Votes:
     +1: breser, stsp
     +1: rhuijben (even though it only fixes one of the many --git issues)


r1482196 | svn-role | 2013-05-13 23:02:41 -0500 (Mon, 13 May 2013)

Remove the '1.7.x-r1481010' branch, reintegrated in r1482195.

r1482195 | svn-role | 2013-05-13 23:02:25 -0500 (Mon, 13 May 2013)

Reintegrate the 1.7.x-r1481010 branch:

 * r1481010
   Fix issue 4365, multi-threaded svnserve pool memory use after clear.
   Justification:
     Possible SEGV.
   Branch: 1.7.x-r1481010
   Votes:
     +1: philip, danielsh, rhuijben


r1482194 | svn-role | 2013-05-13 23:02:19 -0500 (Mon, 13 May 2013)

Remove the '1.7.x-r1475724' branch, reintegrated in r1482193.

r1482193 | svn-role | 2013-05-13 23:02:03 -0500 (Mon, 13 May 2013)

Reintegrate the 1.7.x-r1475724 branch:

 * r1475724
   Fix changelist filtering when --changelist values aren't UTF8.
   Justification:
     User-reported buglet that prevents the use of changelist
     filtering altogether for those sorts of changelist names.
   Branch: 1.7.x-r1475724
   Votes:
     +1: cmpilato, stsp, rhuijben


r1482192 | svn-role | 2013-05-13 23:01:58 -0500 (Mon, 13 May 2013)

Merge r1476359 from trunk:

 * r1476359
   JavaHL thread safety bug.
   Justification:
     Unexpected exceptions can be thrown when thread issues are encountered.
   Votes:
     +1: markphip, stsp
     +0: rhuijben


r1482191 | svn-role | 2013-05-13 23:01:53 -0500 (Mon, 13 May 2013)

Remove the '1.7.x-r1461743' branch, reintegrated in r1482190.

r1482190 | svn-role | 2013-05-13 23:01:38 -0500 (Mon, 13 May 2013)

Reintegrate the 1.7.x-r1461743 branch:

 * r1461743
   Set output parameter in non-maintainer builds, in svn_fs_commit_txn().
   Justification:
     Part of the API contract.
   Branch: 1.7.x-r1461743
   Votes:
     +1: danielsh, stsp, rhuijben


r1482189 | svn-role | 2013-05-13 23:01:32 -0500 (Mon, 13 May 2013)

Merge the r1451678 group from trunk:

 * r1451678, r1452617
   Make get-deps.sh compatible with Solaris /bin/sh.
   Justification:
     Make get-deps.sh work on Solaris. 
   Votes:
     +1: breser, danielsh, stsp
     +0: rhuijben (untested)


r1482188 | svn-role | 2013-05-13 23:01:29 -0500 (Mon, 13 May 2013)

Merge r1426830 from trunk:

 * r1426830
   Resolve issue #3797, by making sure that local changes at the same path
   as a not present file are not skipped.
   Justification:
     Improves 'svn diff' handling of local changes.
   Votes:
     +1: rhuijben, pburba, stsp


r1482187 | svn-role | 2013-05-13 23:01:24 -0500 (Mon, 13 May 2013)

Merge the r1423837 group from trunk:

 * r1423837, r1423840, r1423848
   Fix issue #4168, "no such table: revert_list" for nested wc in sparse wc
   Justification:
     Accessing the wrong database from the revert code gives an ugly error
     which might not be easy to work around.
   Votes:
     +1: rhuijben, pburba, stsp


r1477906 | svn-role | 2013-04-30 23:01:32 -0500 (Tue, 30 Apr 2013)

Merge r1477359 from trunk:

 * r1477359
   Fix broken localisation of a string.
   Justification:
     Allows string to be localised. Fewer translation file mismatches.
   Votes:
     +1 (non-binding): mattiase
     +1: danielsh, philip, julianfoad


r1477905 | svn-role | 2013-04-30 23:01:26 -0500 (Tue, 30 Apr 2013)

Merge r1476607 from trunk:

 * r1476607
   Some svnadmin command help copy-editing.
   Justification:
     For users, consistency; for translators, fewer mismatches.
   Votes:
     +1 (non-binding): mattiase
     +1: danielsh, cmpilato, julianfoad


r1477904 | svn-role | 2013-04-30 23:01:19 -0500 (Tue, 30 Apr 2013)

Merge r1476193 from trunk:

 * r1476193
   Reset SQLite statements on error during 1.7 to 1.8 upgrade.
   Justification:
     Avoid SQLITE_MISUSE errors.
   Votes:
     +1: philip, cmpilato, brane


r1477903 | svn-role | 2013-04-30 23:01:13 -0500 (Tue, 30 Apr 2013)

Merge r1476359 from trunk:

 * r1476359
   JavaHL thread safety bug.
   Justification:
     Unexpected exceptions can be thrown when thread issues are encountered.
   Votes:
     +1: markphip, philip, brane


r1477468 | svn-role | 2013-04-29 23:01:33 -0500 (Mon, 29 Apr 2013)

Merge the r1470238 group from trunk:

 * r1470238, r1471153
   Improve labelling of the file diff in interactive conflict resolution 'df'
   option. Show labels such as "THEIRS" and "MERGED", not just the paths to
   the files on disk.
   Justification:
     It was confusing because the same 'df' option can show a different pair
     of files depending on whether the conflicted operation was an update or
     a merge, and on whether there's a base file or not.
   Votes:
     +1: julianfoad, philip, cmpilato


r1477467 | svn-role | 2013-04-29 23:01:28 -0500 (Mon, 29 Apr 2013)

Merge the r1469862 group from trunk:

 * r1469862, r1469866, r1475704
   Change configure default to --without-apache-libexecdir.
   Justification:
     Before this change, by default, Apache modules would very likely be
     installed outside of $prefix, while still being linked with shared
     libraries in $prefix. This is not expected behaviour.
   Votes:
     +1: brane, philip, cmpilato
     +0: danielsh (refraining from defaulting to ${httpd_libexecdir} is sane:
                   e.g., allow install >1 svn's against a single httpd install)


r1477466 | svn-role | 2013-04-29 23:01:22 -0500 (Mon, 29 Apr 2013)

Merge r1470031 from trunk:

 * r1470031
   Correctly set the 'action' and 'reason' fields of a property conflict.
   API users were seeing the wrong 'action' and 'reason' for some property
   conflicts. 'svn' does not yet use these fields.
   Justification:
     It's wrong.  It's simple.  Fixing it in a 1.x.0 release involves less
     risk of interfering with any client's work-around for the bug.  We may
     want to backport changes to 'svn' to report property conflicts better,
     and then 'svn' may use these fields; I'm working on such a change.
   Votes:
     +1: julianfoad, philip
     +1: rhuijben   (after this patch the situation is better, but I'm not
                     sure if it is optimal. In merge there are 4 trees to
                     consider before we can tell the reason. The 4th tree
                     is available as the pristine version of the local node)


r1477465 | svn-role | 2013-04-29 23:01:16 -0500 (Mon, 29 Apr 2013)

Merge the r1470904 group from trunk:

 * r1470904, r1471744, r1475963, r1476155, r1476181, r1476254
   Tweak an upgrade Sql statement to be easier to understand and a tiny bit
   faster
   Justification:
     The old variant had some theoretical upgrade problems.
   Notes:
     r1470904, r1471744, r1475963 are a series of tweaks to the
     STMT_UPGRADE_31_SELECT_WCROOT_NODES query.  r1476155 is a new
     upgrade test.  r1476181, r1476254 are for 1.6 upgrades.
   Votes:
     +1: philip, pburba, rhuijben


r1477464 | svn-role | 2013-04-29 23:01:09 -0500 (Mon, 29 Apr 2013)

Merge r1476366 from trunk:

 * r1476366
   Eliminate an unsafe printf format string.
   Justification:
     Avoid a compiler warning and avoid fear, uncertainty and doubt when
     people see this code. There is no an actual risk AFAICT; see my email
     <http://svn.haxx.se/dev/archive-2013-04/0601.shtml>.
   Votes:
     +1: julianfoad, danielsh, rhuijben


r1476486 | svn-role | 2013-04-26 23:01:14 -0500 (Fri, 26 Apr 2013)

Merge r1475724 from trunk:

 * r1475724
   Fix changelist filtering when --changelist values aren't UTF8.
   Justification:
     User-reported buglet that prevents the use of changelist
     filtering altogether for those sorts of changelist names.
   Votes:
     +1: cmpilato, philip, julianfoad


r1476485 | svn-role | 2013-04-26 23:01:07 -0500 (Fri, 26 Apr 2013)

Merge r1471028 from trunk:

 * r1471028
   Fix issue 4359, incorrect/missing pack notification.
   Justification:
     Regression from 1.6.
   Notes:
     We already incorrectly merged r1471029 which is not a ^/subversion commit.
   Votes:
     +1: philip, rhuijben, julianfoad


r1476484 | svn-role | 2013-04-26 23:01:03 -0500 (Fri, 26 Apr 2013)

Merge r1470248 from trunk:

 * r1470248
   Fix a little error in 'svn info' whereby it would print the path to the
   '.prej' file multiple times if multiple properties were in conflict.
   Justification:
     Regression since v1.7.
   Votes:
     +1: julianfoad, rhuijben, pburba


r1471516 | svn-role | 2013-04-24 11:35:14 -0500 (Wed, 24 Apr 2013)

Merge the r1469478 group from trunk:

 * r1469478, r1469489, r1469512
   Fix issue 4356, status SEGV after incomplete move
   Justification:
     It's a SEGV.
   Votes:
     +1: philip, rhuijben, pburba


r1471515 | svn-role | 2013-04-24 11:35:09 -0500 (Wed, 24 Apr 2013)

Merge the r1468395 group from trunk:

 * r1468395, r1468566
   Introduce typedef for the svn_fs_freeze() callback function type,
   and give it the requisite SWIG/Python wrapper treatment.
   Justification:
     Without this, the callback is useless in SWIG/Python
   Notes:
     r1468395 adds the typedef; r1468566 updates the bindings.
     (A bindings update only needs two votes to approve it.)
   Votes:
     +1: cmpilato, rhuijben
     +1 (r1468395 only): danielsh


r1471514 | svn-role | 2013-04-24 11:35:04 -0500 (Wed, 24 Apr 2013)

Merge r1471107 from trunk:

 * r1471107
   Improve doc strings of new API svn_stream_lazyopen_create() and its
   callback.
   Justification:
     Doc fix.
   Votes:
     +1: julianfoad, rhuijben, ivan


r1471513 | svn-role | 2013-04-24 11:35:00 -0500 (Wed, 24 Apr 2013)

Merge r1471302 from trunk:

 * r1471302
   Make svn log --search case-sensitive.
   Justification:
     Case-insensitive matching works only for ASCII, and apr_fnmatch() can
     trigger undefined behaviour when matching UTF-8 data case-insensitively.
     See http://svn.haxx.se/dev/archive-2013-04/0374.shtml
   Votes:
     +1: stsp, philip, rhuijben


r1471243 | svn-role | 2013-04-23 23:01:30 -0500 (Tue, 23 Apr 2013)

Merge r1471029 from trunk:

 * r1471029
   Fix issue 4359, incorrect/missing pack notification.
   Justification:
     Regression from 1.6.
   Votes:
     +1: philip, rhuijben, cmpilato


r1471242 | svn-role | 2013-04-23 23:01:26 -0500 (Tue, 23 Apr 2013)

Merge r1470898 from trunk:

 * r1470898
   For issue #4358, make 'svn upgrade' upgrade the indexes of 1.7 working
   copies to exactly the same definition as new working copies have.
   Justification:
     Reduces the number of possible working copies at our users.
   Votes:
     +1: rhuijben, ivan, philip


r1471241 | svn-role | 2013-04-23 23:01:23 -0500 (Tue, 23 Apr 2013)

Merge the r1470936 group from trunk:

 * r1470936, r1470993, r1470994
   Reduce number of open files for update/diff with ra_serf.
   Justification:
     Further fix for issue 4352.  A new-in-1.8 API change so best in 1.8.0.
   Votes:
    +1: philip, ivan, cmpilato


r1471240 | svn-role | 2013-04-23 23:01:08 -0500 (Tue, 23 Apr 2013)

Merge r1470913 from trunk:

 * r1470913
   Reduce number of pipelined requests in ra_serf update reporter.
   Justification:
     Partially fix issue 4352: ra_serf fails: too many open files. Reduce
     number of open files during update/checkout.
   Votes:
    +1: ivan, rhuijben, cmpilato, philip


r1471239 | svn-role | 2013-04-23 23:01:04 -0500 (Tue, 23 Apr 2013)

Merge r1470781 from trunk:

 * r1470781
   Make error messages from property spelling checks more aligned with
   the property usage (say, e.g., "edit" instead of "set" for "propedit")
   Justification:
     Better error messages, better translations, less user annoyance.
   Votes:
     +1: brane, rhuijben, cmpilato


r1471238 | svn-role | 2013-04-23 23:01:00 -0500 (Tue, 23 Apr 2013)

Merge the r1470738 group from trunk:

 * r1470738, r1470908
   Tweak svn_fs_verify API to have the same config options as svn_fs_open
   and svn_fs_create.  Make svn_repos_verify_fs2 use it for consistency.
   Justification:
     Let's get the new API consistent with the old one before releasing it.
     Also, addresses cache performance (use same cache data throughout a
     verfication run) and consistency issues (use separate namespace during
     svnadmin verify instead of the global one).
   Notes:
     rhuijben: r1470908 is necessary to avoid a segfault triggered by javahl.
   Votes:
     +1: stefan2, rhuijben, cmpilato


r1470809 | svn-role | 2013-04-22 23:01:14 -0500 (Mon, 22 Apr 2013)

Merge r1469994 from trunk:

 * r1469994
   Make "h" and "?" work at the conflict prompt as promised by the help text.
   Justification:
     User annoyance.
   Votes:
     +1: julianfoad, philip, rhuijben


r1470808 | svn-role | 2013-04-22 23:01:08 -0500 (Mon, 22 Apr 2013)

Merge r1469871 from trunk:

 * r1469871
   Make the conflict prompt correctly localised again.
   Justification:
     Regression from 1.7.  Needed quickly so translators can get their
     translations done.  <http://svn.haxx.se/dev/archive-2013-04/0429.shtml>
   Votes:
     +1: julianfoad, philip, rhuijben


r1470807 | svn-role | 2013-04-22 23:01:02 -0500 (Mon, 22 Apr 2013)

Merge r1469556 from trunk:

 * r1469556
   Load hooks env in svn_repos_fs_change_rev_prop4() properly.
   Justification:
     Security issue, possible case where hooks environment doesn't get loaded.
   Votes:
     +1: breser, philip, rhuijben


r1470806 | svn-role | 2013-04-22 23:00:58 -0500 (Mon, 22 Apr 2013)

Merge r1469550 from trunk:

 * r1469550
   Fix a potential segfault in merge.
   Justification:
     It's a segfault (though I haven't bothered to make it happen)
   Votes:
     +1: breser, philip, rhuijben


r1470103 | svn-role | 2013-04-19 23:00:52 -0500 (Fri, 19 Apr 2013)

Merge r1469513 from trunk:

 * r1469513
   Give the correct command to unpack SQLite's amalgamation .zip file.
   Justification:
     Good document is good.
   Votes:
     +1: blair, rhuijben, philip


r1469682 | svn-role | 2013-04-18 23:00:57 -0500 (Thu, 18 Apr 2013)

Merge r1469248 from trunk:

 * r1469248
   Install mod_dontdothat with install-tools into $(APACHE_LIBEXECDIR).
   Justification:
     Fixes issue #4338 which is a 1.8 blocker.
     See: http://subversion.tigris.org/issues/show_bug.cgi?id=4338
   Votes:
     +1: brane, rhuijben, philip


r1469681 | svn-role | 2013-04-18 23:00:54 -0500 (Thu, 18 Apr 2013)

Merge r1468565 from trunk:

 * r1468565
   Use correct plural localisation for conflict summary messages.
   Justification:
     Required for several translations.
   Votes:
     +1: philip, brane, rhuijben
     +1 (non-binding): mattiase


r1469680 | svn-role | 2013-04-18 23:00:52 -0500 (Thu, 18 Apr 2013)

Merge r1468347 from trunk:

 * r1468347
   Handle POST errors like MKACTIVITY errors.
   Justification:
     Consistent error reporting for v1 and v2 protocols.
   Votes:
     +1: philip, rhuijben, brane


r1469153 | svn-role | 2013-04-17 23:01:01 -0500 (Wed, 17 Apr 2013)

Merge r1468439 from trunk:

 * r1468439
   Fix assertion on checkout from pre-1.8 server over ra_serf with
   http-bulk-updates=off.
   Justification:
     svn checkout fails.
   Votes:
     +1: ivan, rhuijben, philip


r1469152 | svn-role | 2013-04-17 23:00:56 -0500 (Wed, 17 Apr 2013)

Merge r1468151 from trunk:

 * r1468151
   Map missing some missing bits to JavaHL
   Justification:
     A few constants and struct members were not mapped to JavaHL,
     and a newly-deprecated function was being called.
   Votes:
     +1: brane
     +0: rhuijben (reviewed, not tested)


r1469151 | svn-role | 2013-04-17 23:00:53 -0500 (Wed, 17 Apr 2013)

Merge r1468487 from trunk:

 * r1468487
   Add SWIG Perl support for svn_client_log3 and svn_client_log4.
     Bring the perl bindings a little closer to being up-to-date.
   Votes:
     +1: philip, rhuijben


r1468302 | svn-role | 2013-04-15 23:00:52 -0500 (Mon, 15 Apr 2013)

Merge r1467597 from trunk:

 * r1467597
   Better error message if authentication fails and -F - was used.
   Justification:
     Nice-to-have usability fix. Explains a side-effect of the new-in-1.8
     interactive prompting default behaviour which could be considered a
     regression from 1.7 (use case now requires --force-interactive).
     See here for details:
     http://subversion.tigris.org/issues/show_bug.cgi?id=3913#desc5
   Votes:
     +1: stsp, pburba, brane


r1468301 | svn-role | 2013-04-15 23:00:49 -0500 (Mon, 15 Apr 2013)

Merge the r1467440 group from trunk:

 * r1467440, r1467450, r1467481
   Unclutter maintainer-mode stack traces.
   Justification:
     Code was in flux when the branch was cut.  Maintainer sanity.
   Votes:
     +1: danielsh, stsp, brane


r1468161 | svn-role | 2013-04-15 12:25:41 -0500 (Mon, 15 Apr 2013)

Remove the '1.8.x-svn_fs_info-removal' branch, reintegrated in r1468160.

r1468160 | svn-role | 2013-04-15 12:25:23 -0500 (Mon, 15 Apr 2013)

Reintegrate the 1.8.x-svn_fs_info-removal branch:

 * 1.8.x-svn_fs_info-removal
   Remove an API that is #define'd away and not compiled, as well as
   fs-loader.h parts of it.
   Justification:
     Deleting dead code.  Will be released in 1.9x.
   Branch: 1.8.x-svn_fs_info-removal
   Votes:
     +1: danielsh, stsp, rhuijben


r1468149 | svn-role | 2013-04-15 12:10:34 -0500 (Mon, 15 Apr 2013)

Merge r1467675 from trunk:

 * r1467675
   Add missing Doxygen @since marker to svn_auth_forget_credentials().
   Justification:
     Friendliness to API consumers.
   Notes:
     I didn't check whether other related APIs are also missing @since tags.
   Votes:
     +1: danielsh, rhuijben, pburba


r1468148 | svn-role | 2013-04-15 12:10:30 -0500 (Mon, 15 Apr 2013)

Merge r1467803 from trunk:

 * r1467803
   Add missing linefeed in a message.
   Justification:
     Avoid embarrassing untidiness in textual output.
   Votes:
     +1 (non-binding): mattiase
     +1: rhuijben, breser, pburba


r1468147 | svn-role | 2013-04-15 12:10:28 -0500 (Mon, 15 Apr 2013)

Merge r1467807 from trunk:

 * r1467807
   Fix segfault when using --internal-diff
   Justification:
     It's a segfault.
   Votes:
     +1: breser, ivan, philip,
         pburba (gratuitous 4th vote that I tried to commit seconds
                 after philip, but what the heck)


r1468146 | svn-role | 2013-04-15 12:10:21 -0500 (Mon, 15 Apr 2013)

Merge r1467668 from trunk:

 * r1467668
   Update INSTALL about in-tree dependencies (from get-deps.sh)
   Justification:
     Less misinformation for anyone building from source.
   Votes:
     +1 (non-binding): mattiase
     +1: rhuijben (documentation change doesn't need full voting process)


r1468145 | svn-role | 2013-04-15 12:10:18 -0500 (Mon, 15 Apr 2013)

Merge r1467587 from trunk:

 * r1467587
   Fix issue #3913, "svnrdump load" is not working in interactive mode
   Justification:
     Fixes a UI quirk requiring users to remember typing --force-interactive
     for auth creds prompting to work, in a situation where we should
     be prompting for creds by default IMHO.
   Votes:
     +1: stsp, rhuijben, pburba


r1461947 | svn-role | 2013-03-27 23:01:00 -0500 (Wed, 27 Mar 2013)

Merge r1461278 from trunk:

 * r1461278
   Make svnserve log the replayed revision, not the low-water-mark
   revision, when logging the 'replay' operation.
   Justification:
     User-reported bug confusing administrators.
   Votes:
     +1: cmpilato, rhuijben, stefan2


r1461946 | svn-role | 2013-03-27 23:00:54 -0500 (Wed, 27 Mar 2013)

Remove the '1.7.x-neon-properr' branch, reintegrated in r1461945.

r1461945 | svn-role | 2013-03-27 23:00:37 -0500 (Wed, 27 Mar 2013)

Reintegrate the 1.7.x-neon-properr branch:

 * ^/subversion/branches/1.7.x-neon-properr
   Justification:
     Error messages which refer to "date" and "author" (when they mean
     to say "svn:date" and "svn:author") can cause confusion.
   Branch:
     ^/subversion/branches/1.7.x-neon-properr
   Votes:
     +1: cmpilato, rhuijben, stefan2


r1461944 | svn-role | 2013-03-27 23:00:30 -0500 (Wed, 27 Mar 2013)

Merge r1453780 from trunk:

 * r1453780
   Reject operations on some properties for activity resources.
   Justification:
     It's a SEGV.
   Votes:
     +1: philip, breser, stefan2

Fixes CVE-2013-1849, see our advisory at:
http://subversion.apache.org/security/CVE-2013-1849-advisory.txt


r1461943 | svn-role | 2013-03-27 23:00:25 -0500 (Wed, 27 Mar 2013)

Merge r1453780 from trunk:

 * r1453780
   Reject operations on some properties for activity resources.
   Justification:
     It's a SEGV.
   Votes:
     +1: philip, breser, stefan2

Fixes CVE-2013-1849, see our advisory at:
http://subversion.apache.org/security/CVE-2013-1849-advisory.txt


r1461407 | svn-role | 2013-03-26 23:00:54 -0500 (Tue, 26 Mar 2013)

Merge r1425368 from trunk:

 * r1425368
   Use the right api for generating the repository dirent in mod_dav_svn.
   Justification:
     Using dav_svn_get_repos_path() causes an assertion on Windows. This
     public api was unused until the in-repo-authz was merged to trunk.
   Votes:
     +1: rhuijben, pburba, ivan


r1461406 | svn-role | 2013-03-26 23:00:48 -0500 (Tue, 26 Mar 2013)

Remove the '1.7.x-issue4257' branch, reintegrated in r1461405.

r1461405 | svn-role | 2013-03-26 23:00:32 -0500 (Tue, 26 Mar 2013)

Reintegrate the 1.7.x-issue4257 branch:

 * ^/subversion/branches/1.7.x-issue4257
   Fix issue #4257 ("neon get_dir leads to bogus NODES rows").
   Justification:
     Bug can tigger assertions in the WCDB code.
   Branch:
     ^/subversion/branches/1.7.x-issue4257
   Notes:
     While not strictly related to this issue, svn_ra_neon__do_stat()
     could probably stand to have the same patch applied as
     svn_ra_neon__get_dir(), as this pattern of using full URLs
     was found to be troublesome in issue #4332's research, too.
   Votes:
     +1: cmpilato, breser, rhuijben


r1461404 | svn-role | 2013-03-26 23:00:24 -0500 (Tue, 26 Mar 2013)

Merge r1458341 from trunk:

 * r1458341
   Fix issue 4337, client memory leak in "svn log" for ra_svn.
   Justification:
     Client leaks hundreds of MB on large repositories.
   Votes:
     +1: philip, breser, rhuijben


r1460965 | svn-role | 2013-03-25 23:00:58 -0500 (Mon, 25 Mar 2013)

Remove the '1.7.x-issue4332' branch, reintegrated in r1460964.

r1460964 | svn-role | 2013-03-25 23:00:42 -0500 (Mon, 25 Mar 2013)

Reintegrate the 1.7.x-issue4332 branch:

 * ^/subversion/branches/1.7.x-issue4332
   Fix issue #4332 ("neon OPTIONS request on repository root causes
   authz access denied").
   Justification:
     This is a user-reported bug preventing what should be a
     completely valid remote deletion operation when Neon is the HTTP
     library in use.  (As a bonus side effect, this shaves one or two
     network turnarounds per deletion target off of this operation,
     too!)  It's a regression from 1.6.
   Branch:
     ^/subversion/branches/1.7.x-issue4332
   Votes:
     +1: cmpilato, philip, breser


r1454652 | svn-role | 2013-03-08 22:05:28 -0600 (Fri, 08 Mar 2013)

Merge r1421380 from trunk:

 * r1421380
   Issue #4272: s/assertion/error/ in the DAV proxy code.
   Justification:
     The assertion has been run into in the wild
   Votes:
     +1: danielsh, rhuijben, philip


r1454237 | svn-role | 2013-03-07 22:05:26 -0600 (Thu, 07 Mar 2013)

Merge r1443929 from trunk:

 * r1443929
   Introduce a subpool.
   Justifcation:
     Better server memory use.
   Votes:
     +1: philip, ivan, rhuijben

Fixes CVE-2013-1845, see our advisory at:
http://subversion.apache.org/security/CVE-2013-1845-advisory.txt


r1441698 | svn-role | 2013-02-01 22:03:13 -0600 (Fri, 01 Feb 2013)

Merge r1435361 from trunk:

 * r1435361
   JavaHL status API does not respect the ignoreExternals boolean.
   Justification:
     The API does not work properly and the fix was obvious.
   Votes:
     +1: markphip, rhuijben


r1435019 | svn-role | 2013-01-17 22:02:34 -0600 (Thu, 17 Jan 2013)

Remove the '1.7.x-r1352031' branch, reintegrated in r1435018.

r1435018 | svn-role | 2013-01-17 22:02:19 -0600 (Thu, 17 Jan 2013)

Reintegrate the 1.7.x-r1352031 branch:

 * r1352031
   Change get-deps.sh to use zlib 1.2.7.
   Justification:
     1.2.5 is no longer available for download at the URL get-deps.sh tries.
     This prevents get-deps.sh from failling.
   Notes:
     The branch is needed since get-deps.sh has removed neon on trunk which
     causes conflicts.
   Branch:
     ^/subversion/branches/1.7.x-r1352031
   Votes:
     +1: breser, brane, rhuijben


r1434549 | svn-role | 2013-01-16 22:02:31 -0600 (Wed, 16 Jan 2013)

Remove the '1.7.x-issue4263' branch, reintegrated in r1434548.

r1434548 | svn-role | 2013-01-16 22:02:15 -0600 (Wed, 16 Jan 2013)

Reintegrate the 1.7.x-issue4263 branch:

 * ^/subversion/branches/1.7.x-issue4263
   Fix svnrdump inability to load dump files with non-LF line endings in
   'svn:*' properties.
   Justification:
     Other tools have had this issue resolved, svnrdump should as well.
   Branch:
     ^/subversion/branches/1.7.x-issue4263
   Votes:
     +1: breser, danielsh, rhuijben


r1428163 | svn-role | 2013-01-02 22:01:17 -0600 (Wed, 02 Jan 2013)

Merge r1345740 from trunk:

 * r1345740
   Remove a cast that is both ugly, and apparently illegal in g++ 4.7.
   Justification:
     Fails to build.
   Votes:
     +1: philip, brane, rhuijben


r1425401 | svn-role | 2012-12-22 22:00:35 -0600 (Sat, 22 Dec 2012)

Merge r1390653 from trunk:

 * r1390653
   Add Vary: header to GET response.
   Justification:
     The 1.8 serf-only client may fail to work with caching proxies.
   Votes:
     +1: philip, stefan2, brane


r1425240 | svn-role | 2012-12-21 22:00:33 -0600 (Fri, 21 Dec 2012)

Merge r1422053 from trunk:

 * r1422053
   Remove .swig_checked from tarball.
   Justification:
     Unnecessary file in tarballs.
   Votes:
     +1: breser, rhuijben, danielsh


r1424799 | svn-role | 2012-12-20 22:00:48 -0600 (Thu, 20 Dec 2012)

Remove the '1.6.x-r1387226' branch, reintegrated in r1424798.

r1424798 | svn-role | 2012-12-20 22:00:32 -0600 (Thu, 20 Dec 2012)

Reintegrate the 1.6.x-r1387226 branch:

 * r1387226
   Fix issue #4231, mod_dav_svn asserts upon MKCOL within <Location />
   Justification:
     Server shouldn't crash. Also fixed for 1.7.x in 1.7.7.
   Branch:
     ^/subversion/branches/1.6.x-r1387226
   Votes:
     +1: stsp, stefan2, philip


r1424285 | svn-role | 2012-12-19 22:00:49 -0600 (Wed, 19 Dec 2012)

Merge r1422100 from trunk:

 * r1422100
   Delay storing handle to fix assert when rep-cache is inaccessible.
   Justification:
     It's an assert.
   Votes:
     +1: philip, danielsh, rhuijben


r1424284 | svn-role | 2012-12-19 22:00:45 -0600 (Wed, 19 Dec 2012)

Remove the '1.7.x-r1423646' branch, reintegrated in r1424283.

r1424283 | svn-role | 2012-12-19 22:00:30 -0600 (Wed, 19 Dec 2012)

Reintegrate the 1.7.x-r1423646 branch:

 * ^/subversion/branches/1.7.x-r1423646
   Work around http://www.freebsd.org/cgi/query-pr.cgi?pr=174521 .
   Justification:
     Small fix, avoids cryptic error message, works elsewhere.
   Branch:
     ^/subversion/branches/1.7.x-r1423646
   Votes:
     +1: danielsh, arfrever, rhuijben


r1421660 | svn-role | 2012-12-13 22:02:58 -0600 (Thu, 13 Dec 2012)

Merge r1421103 from trunk:

 * r1421103
   Fix segfault with kwallet support.
   Justification:
     Users may get segfaults when using the kwallet support since the pool
     cleanup is setup wrong.
   Votes:
     +1: breser, rhuijben, danielsh


r1418182 | svn-role | 2012-12-06 22:02:33 -0600 (Thu, 06 Dec 2012)

Merge the r1403588 group from trunk:

 * r1403588, r1403691
   Expand the scope of mod_dav_svn's validation of client-reported
   and client-requested revisions during update operations.
   Justifications:
     mod_dav_svn should gracefully complain about revisions > HEAD
     in the update report all the time, not only when doing an
     update operation that doesn't explicitly request a target
     revision.
   Votes:
     +1: cmpilato, rhuijben, brane


r1417733 | svn-role | 2012-12-05 22:02:28 -0600 (Wed, 05 Dec 2012)

Merge r1409146 from trunk:

 * r1409146
   Make sure svn_uri_get_file_url_from_dirent() returns a canonical url for
   Windows drive roots.
   Justification:
     Handles a Windows specific corner case in a generic conversion function.
   Votes:
     +1: rhuijben, stefan2, pburba


r1416767 | svn-role | 2012-12-03 22:02:25 -0600 (Mon, 03 Dec 2012)

Merge r1345740 from trunk:

 * r1345740
   Remove a cast that is both ugly, and apparently illegal in g++ 4.7.
   Justification:
     Fails to build.
   Votes:
     +1: philip, rhuijben, stefan2


r1411984 | svn-role | 2012-11-20 22:02:07 -0600 (Tue, 20 Nov 2012)

Merge the r1403964 group from trunk:

 * r1403964, r1403982, r1410106, r1410203
   Make fs_fs properly cleanup after a failed transmission of a representation.
   Justification:
     Read errors can create problems for users of the WANdisco replicator
     which does retry requests.  Can result in garbage representations in the
     rev file.  
     Also, can cause false-positive "A previous representation is being written
     by this process" errors.
   Votes:
     +1: breser, danielsh, philip


r1411983 | svn-role | 2012-11-20 22:01:58 -0600 (Tue, 20 Nov 2012)

Remove the '1.6.x-rep_write_cleanup' branch, reintegrated in r1411982.

r1411982 | svn-role | 2012-11-20 22:01:41 -0600 (Tue, 20 Nov 2012)

Reintegrate the 1.6.x-rep_write_cleanup branch:

 * r1403964, r1403982, r1410106, r1410203
   Make fs_fs properly cleanup after a failed transmission of a representation.
   Justification:
     Read errors can create problems for users of the WANdisco replicator
     which does retry requests.  Can result in garbage representations in the
     rev file.  
   Notes:
     Branch is required since our client code needs a small tweak to deal
     with pool lifetimes to make the fix work properly with ra_local.  We'd
     made a similar change with wcng in 1.7 already.
   Branch:
     ^/subversion/branches/1.6.x-rep_write_cleanup
   Votes:
     +1: breser, danielsh, stefan2


r1407352 | svn-role | 2012-11-08 22:01:06 -0600 (Thu, 08 Nov 2012)

Merge r1403258 from trunk:

 * r1403258
   Fix incorrect status returned by the 1.6 API.
   Justification:
     Regression for users of the 1.6 API.
   Votes:
     +1: philip, rhuijben, cmpilato


r1407351 | svn-role | 2012-11-08 22:01:02 -0600 (Thu, 08 Nov 2012)

Remove the '1.7.x-r1401915' branch, reintegrated in r1407350.

r1407350 | svn-role | 2012-11-08 22:00:46 -0600 (Thu, 08 Nov 2012)

Reintegrate the 1.7.x-r1401915 branch:

 * r1401915
   Ignore file externals with mergeinfo when merging.
   Justification:
     Prevents a segfault,
     see http://svn.haxx.se/dev/archive-2012-10/0364.shtml
   Branch:
     ^/subversion/branches/1.7.x-r1401915
   Votes:
     +1: pburba, steveking, philip


r1403967 | svn-role | 2012-10-30 23:00:11 -0500 (Tue, 30 Oct 2012)

Merge r1403583 from trunk:

 * r1403583
   In ra_serf, treat marshaled errors with 0 error codes the same as
   errors with no provided error code.
   Justifications:
     Fixes the cause of a client-side hang in ra_serf's handling of
     Subversion's custom XML error tags.
   Votes:
     +1: cmpilato, danielsh, rhuijben


r1403966 | svn-role | 2012-10-30 23:00:07 -0500 (Tue, 30 Oct 2012)

Remove the '1.7.x-r1399174' branch, reintegrated in r1403965.

r1403965 | svn-role | 2012-10-30 22:59:51 -0500 (Tue, 30 Oct 2012)

Reintegrate the 1.7.x-r1399174 branch:

 * r1399174
   Fix a diff parser bug that prevents some patch files from being applied.
   Justification:
     Prevents users from applying certain patches with 'svn patch', see
     http://svn.haxx.se/users/archive-2012-10/0081.shtml
   Branch:
     ^/subversion/branches/1.7.x-r1399174
   Votes:
     +1: stsp, steveking, rhuijben


r1400757 | svn-role | 2012-10-21 23:03:35 -0500 (Sun, 21 Oct 2012)

Merge r1390653 from trunk:

 * r1390653
   Add Vary: header to GET response.
   Justification:
     The 1.8 serf-only client may fail to work with caching proxies.
   Votes:
     +1: philip, cmpilato, breser
     +0: danielsh


r1400756 | svn-role | 2012-10-21 23:03:32 -0500 (Sun, 21 Oct 2012)

Merge r1394519 from trunk:

 * r1394519
   Fix issue #3531 ("Error with AuthzSVNAccessFile groups parsing in
   mod_authz_svn").
   Justification:
     This bug prevents users from defining access rules for certain
     repositories, resulting in some cases in access being forbidden
     to those repositories.
   Votes:
     +1: cmpilato, danielsh, breser


r1400361 | svn-role | 2012-10-19 23:03:28 -0500 (Fri, 19 Oct 2012)

Merge r1398100 from trunk:

 * r1398100
   Add missing 'prop-mods' and 'text-mods' attributes in the changed paths
   section of the output of 'log -v --xml'.  When these attributes were
   added in 1.7.0 they were accidentally only included for copied paths.
   Justification:
     Simple fix. Seems unlikely to cause harm.
   Votes:
     +1: julianfoad, cmpilato, danielsh


r1400360 | svn-role | 2012-10-19 23:03:25 -0500 (Fri, 19 Oct 2012)

Merge r1237779 from trunk:

 * r1237779
   Fix sense of property validation on load and make the revprop change atomic.
   Justification:
     Validation is supposed to be on by default but is off, adding
     --bypass-prop-validation switches it on.
   Votes:
     +1: philip, cmpilato, danielsh


r1398635 | svn-role | 2012-10-15 23:03:29 -0500 (Mon, 15 Oct 2012)

Remove the '1.7.x-r1398325' branch, reintegrated in r1398634.

r1398634 | svn-role | 2012-10-15 23:03:13 -0500 (Mon, 15 Oct 2012)

Reintegrate the 1.7.x-r1398325 branch:

 * r1398325
   Fix some improper usage of #ifdef where #if should be used.
   Justification:
     Incorrect detection of threading is a bug.
   Branch:
     ^/subversion/branches/1.7.x-r1398325
   Votes:
     +1: breser, danielsh, stsp


r1397428 | svn-role | 2012-10-11 23:02:57 -0500 (Thu, 11 Oct 2012)

Merge r1396285 from trunk:

 * r1396285
   Verify return value instead of pointer.
   Justification:
     Pointer/boolean code bug. Allows crashing 'svn' with an explicit
     --username that doesn't match the stored username.
   Votes:
     +1: rhuijben, steveking, brane


r1393280 | svn-role | 2012-10-02 23:02:20 -0500 (Tue, 02 Oct 2012)

Merge r1351117 from trunk:

 * r1351117
   Fix svn_stream_read() in swig-py to work with SWIG-2.0.5
   Justification:
     Inconsistent behavior with different versions of SWIG.
   Votes:
     +1: breser, danielsh (via IRC)


r1392728 | svn-role | 2012-10-01 23:02:40 -0500 (Mon, 01 Oct 2012)

Remove the '1.7.x-serf-server-root-segfaults' branch, reintegrated in r1392727.

r1392727 | svn-role | 2012-10-01 23:02:24 -0500 (Mon, 01 Oct 2012)

Reintegrate the 1.7.x-serf-server-root-segfaults branch:

 * r1365519, r1383029, r1383483
   Fix assertions in ra_serf triggered when communicating with a
   repository hosted at the server root URL.
   Justification:
     Assertions tell us that stuff is wrong.  Very wrong.
   Notes:
     r1365519: renames variables; dups a string into the session pool
     r1383029: fixes svn_ra_serf__reparent to avoid NULL url.path
     r1383483: fixes a couple of other NULL url.path instances
   Branch:
     ^/subversion/branches/1.7.x-serf-server-root-segfaults
   Votes:
     +1: cmpilato, rhuijben, breser


r1392726 | svn-role | 2012-10-01 23:02:18 -0500 (Mon, 01 Oct 2012)

Merge r1374198 from trunk:

 * r1374198
   Remove mod_dontdothat from install-tools so that configurations
   --without-apxs will not try to build it.
   Justification:
     Fixes regression from 1.7.5.
   Notes:
     Reverts backport of r1307177 because that caused builds to fail
     when Apache headers and libraries were not present. Trunk has a
     followup in r1374357 that reinstates the desired behaviour.
   Votes:
     +1: brane, breser, danielsh (via IRC)


r1391948 | svn-role | 2012-09-29 23:02:09 -0500 (Sat, 29 Sep 2012)

Merge r1389658 from trunk:

 * r1389658
   Fix the Perl bindings building with newer versions of SWIG.
   Justification:
     Convenience for users using newer verisons of SWIG.
   Votes:
     +1: breser, brane


r1391749 | svn-role | 2012-09-28 23:02:39 -0500 (Fri, 28 Sep 2012)

Remove the '1.7.x-r1389928' branch, reintegrated in r1391748.

r1391748 | svn-role | 2012-09-28 23:02:23 -0500 (Fri, 28 Sep 2012)

Reintegrate the 1.7.x-r1389928 branch:

 * r1389928
   Fix a 1.7.x test to pass within a format 30 working copy.
   Justification:
     Convenience for users of trunk clients.
   Branch:
     ^/subversion/branches/1.7.x-r1389928
   Votes:
     +1: stsp, cmpilato, brane


r1391747 | svn-role | 2012-09-28 23:02:18 -0500 (Fri, 28 Sep 2012)

Merge r1391641 from trunk:

 * r1391641
   Convert client connection time-to-live value from seconds to
   microseconds, which is the unit expected by the API.  (An API doc
   error in the past was the likely cause of this problem.)
   Justification:
     50 microseconds really isn't a sufficient lifespan for ... anything.
   Votes:
     +1: cmpilato, rhuijben, brane


r1391746 | svn-role | 2012-09-28 23:02:15 -0500 (Fri, 28 Sep 2012)

Merge the r1391020 group from trunk:

 * r1391020, r1391022
   Fix issue #4234, "svndumpfilter exclude --targets wants pathname to
   start with '/'"
   Justification:
     Fixes inconsistent parameter processing. Paths specified on the command
     line and via --targets file should be handled the same way.
   Notes:
     Test added by r1391022 depends on r1389499 backport to PASS in 1.8 WC.
   Votes:
     +1: stsp, cmpilato, rhuijben


r1391745 | svn-role | 2012-09-28 23:02:11 -0500 (Fri, 28 Sep 2012)

Merge r1390965 from trunk:

 * r1390965
   Avoid claiming all tests pass when most fail to run.
   Justification:
     Summary should be accurate.
   Votes:
     +1: philip, cmpilato, rhuijben


r1391744 | svn-role | 2012-09-28 23:02:09 -0500 (Fri, 28 Sep 2012)

Merge the r1374800 group from trunk:

 * r1374800, r1374802, r1389364
   Fix issues with applying Git patch files.
   Justification:
     It's a small change, and it allows applying patches that failed
     before.
   Votes:
     +1 (without r1389364): steveking
     +1: stsp, cmpilato, rhuijben


r1391743 | svn-role | 2012-09-28 23:02:05 -0500 (Fri, 28 Sep 2012)

Merge r1174342 from trunk:

 * r1174342
   Fix issue 4016, make status descend into dir externals after upgrade.
   Justification:
     Status doesn't work properly after upgrade.
   Votes:
     +1: philip, cmpilato, rhuijben


r1391295 | svn-role | 2012-09-27 23:02:10 -0500 (Thu, 27 Sep 2012)

Merge r1387943 from trunk:

 * r1387943
   Fix unbounded memory use with SVNPathAuthz short_circuit.
   Justification:
     Server process may abort if memory exhausted.
   Votes:
     +1: philip, ivan, cmpilato


r1391294 | svn-role | 2012-09-27 23:02:07 -0500 (Thu, 27 Sep 2012)

Merge r1387226 from trunk:

 * r1387226
   Fix issue 4231, mod_dav_svn assert with SVNAutoVersioning and <Location />
   Justification:
     It's an assert.
   Votes:
     +1: philip, rhuijben, cmpilato


r1391293 | svn-role | 2012-09-27 23:02:04 -0500 (Thu, 27 Sep 2012)

Merge r1380295 from trunk:

 * r1380295
   Make sure a proper revision or SVN_INVALID_REVNUM is returned as the
   result of svn_client_update4() when not performing a real update.
   Justification:
     Implement api properly.
   Votes:
     +1: rhuijben, philip, cmpilato


r1391292 | svn-role | 2012-09-27 23:02:01 -0500 (Thu, 27 Sep 2012)

Merge r1365592 from trunk:

 * r1365592
   Fix issue 4224, file externals don't update with old mod_dav_svn
   Justification:
     Backward compatibility using 1.7 clients with old servers.
   Votes:
     +1: philip, rhuijben, cmpilato


r1389702 | svn-role | 2012-09-24 23:01:49 -0500 (Mon, 24 Sep 2012)

Merge r1378847 from trunk:

 * r1378847
   Make GNOME keyring library work with very old glib.
   Justification:
     Keyring library fails to load at runtime and it's hard for the user
     to work out why.
   Votes:
     +1: philip, brane, stsp
     +0: danielsh


r1382817 | svn-role | 2012-09-10 08:10:04 -0500 (Mon, 10 Sep 2012)

Remove the '1.6.x-r1330410' branch, reintegrated in r1382815.

r1382815 | svn-role | 2012-09-10 08:09:48 -0500 (Mon, 10 Sep 2012)

Reintegrate the 1.6.x-r1330410 branch:

 * r1330410, r1330554
   Fix an error leak in the hook script invocation code.
   Justification:
     This bug can cause a server process to hang.
   Notes:
     - r1330410 was merged from trunk and fixes the bug.
     - r1330554 is a 1.6.x-specific follow-up fix that prevents the bug fix
        from changing control flow such that a file handle is closed which
        was never opened.
   Branch:
     ^/subversion/branches/1.6.x-r1330410
   Votes:
     +1: stsp, philip, cmpilato


r1380973 | svn-role | 2012-09-04 23:02:40 -0500 (Tue, 04 Sep 2012)

Merge r1380697 from trunk:

 * r1380697
   Fix duplicated Index: lines in 'svn diff' output with external diff tool.
   Justification:
     Obvious bug. User complained and submitted patch.
   Votes:
     +1: stsp, philip, rhuijben


r1380972 | svn-role | 2012-09-04 23:02:21 -0500 (Tue, 04 Sep 2012)

Remove the '1.7.x-r1375052' branch, reintegrated in r1380971.

r1380971 | svn-role | 2012-09-04 23:02:04 -0500 (Tue, 04 Sep 2012)

Reintegrate the 1.7.x-r1375052 branch:

 * r1375052
   Don't complain about unknown password stores listed in the
   password-stores runtime configuration area -- simply ignore them.
   Justification:
     The runtime configuration must necessarily be compatible -- that
     is, at least functional -- across many versions of Subversion.
     Prior to this change, though, adding "gpg-agent" to the
     password-stores list so I can use that feature with my trunk
     client would cause my 1.7.x client to choke.
   Branch:
     ^/subversion/branches/1.7.x-r1375052
   Votes:
     +1: cmpilato, danielsh, rhuijben


r1380970 | svn-role | 2012-09-04 23:01:44 -0500 (Tue, 04 Sep 2012)

Remove the '1.6.x-r1306111' branch, reintegrated in r1380969.

r1380969 | svn-role | 2012-09-04 23:01:27 -0500 (Tue, 04 Sep 2012)

Reintegrate the 1.6.x-r1306111 branch:

 * r1306111
   Handle NULL dates in libsvn_ra_svn.
   Justification:
     Avoids segfault.
   Branch:
     ^/subversion/branches/1.6.x-r1306111
   Votes:
     +1: danielsh, stsp, philip


r1377564 | svn-role | 2012-08-26 23:00:02 -0500 (Sun, 26 Aug 2012)

Merge r1375089 from trunk:

 * r1375089
   Print "All tests successful" at the end of 'make check'.
   Justification:
     Users ask whether "XFAIL > 0" is a problem.
   Votes:
     +1: danielsh, rhuijben, brane


r1376823 | svn-role | 2012-08-23 22:59:51 -0500 (Thu, 23 Aug 2012)

Merge r1376414 from trunk:

 * r1376414
   Fix a memory read bug.
   Justification:
     Undefined behaviour.
   Votes:
     +1: philip, stsp, rhuijben


r1371558 | svn-role | 2012-08-09 23:03:30 -0500 (Thu, 09 Aug 2012)

Merge r1371282 from trunk:

 * r1371282
   Fix a sandbox violation in a test suite test.  (The test executes
   'svn' outside the typical framework for doing so without pointing
   the binary at the controlled runtime configuration directory used
   by other tests.)
   Justification:
     Broken tests lead to false positives in the hunt for broken
     software.
   Votes:
     +1: cmpilato, brane, julianfoad


r1369261 | svn-role | 2012-08-03 23:03:12 -0500 (Fri, 03 Aug 2012)

Merge r1368128 from trunk:

 * r1368128
   Segfault in handling deleted wc items.
   Justification:
      Unknown circumstances can lead to the situation that neither
      the relpath for BASE nor the one for WORK are available.
      The patch makes the implicit assumption of the latter being
      non-NULL if the first isn't explicit. Even if the root cause
      was random wc corruption, this patch will at least make our
      code more robust.
      This issue is also the 3rd-most common cause of SVN lib related
      crashes reported in TSVN.
   Votes:
     +1: stefan2, steveking, philip


r1369260 | svn-role | 2012-08-03 23:03:09 -0500 (Fri, 03 Aug 2012)

Merge r1368065 from trunk:

 * r1368065
   Incomplete copy information leading to segfault.
   Justification:
      Although this doesn't address nor identify the root cause of
      the problem, it is still better to return an svn_error_t*
      instead of simply segfaulting.
      This issue is also the most common cause of SVN lib related
      crashes reported in TSVN.
   Votes:
     +1: stefan2, steveking, philip


r1369259 | svn-role | 2012-08-03 23:03:06 -0500 (Fri, 03 Aug 2012)

Merge the r1368197 group from trunk:

 * r1368197, r1368198
   Fix issue #4216 ("Error updating relocated working copy with
   server-relative externals defined").
   Justification:
     Fixes user-reported problem.
   Notes:
     r1368197: This contains the actual fix.
     r1368198: This contains some follow-up comment tweaks that help
               explain the relevant code region more thoroughly.
   Votes:
     +1: cmpilato, brane, steveking


r1368349 | svn-role | 2012-08-01 23:03:04 -0500 (Wed, 01 Aug 2012)

Merge r1362508 from trunk:

 * r1362508
   Avoid errors when users run 'svnlook changed', 'svnlook
   dirs-changed', or 'svnlook diff' on r0.  Though the output from
   those requests will always be empty, there's nothing inherently
   wrong with the requests themselves.
   Justification:
     Resolves complaint made by user(s).
   Votes:
     +1: cmpilato, steveking, jerenkrantz


r1368348 | svn-role | 2012-08-01 23:03:02 -0500 (Wed, 01 Aug 2012)

Merge r1367498 from trunk:

 * r1367498
   Make FSFS revision files independent of APR hash order.
   Justification:
     Make 'svnadmin load', and other commits,  produce reproducible revision
     files.
   Votes:
     +1: philip, steveking, jerenkrantz


r1368347 | svn-role | 2012-08-01 23:02:59 -0500 (Wed, 01 Aug 2012)

Merge r1307177 from trunk:

 * r1307177
   Move mod_dontdothat to install-tools.
   Justification:
     Undo compatibility break of 'make install' in 1.7.3.
   Votes:
     +1: danielsh, gstein, jerenkrantz


r1367857 | svn-role | 2012-07-31 23:04:00 -0500 (Tue, 31 Jul 2012)

Remove the '1.7.x-r1361341' branch, reintegrated in r1367856.

r1367856 | svn-role | 2012-07-31 23:03:45 -0500 (Tue, 31 Jul 2012)

Reintegrate the 1.7.x-r1361341 branch:

 * r1361341
   Avoid checking for working copies above the current working copy from
   svn_wc__acquire_write_lock() to avoid checking for .svn/wc.db in
   directories where we might not have read permission.
   Justification:
     Resolves a problem reported on the CollabNet Subversion forum.
   Branch: ^/subversion/branches/1.7.x-r1361341
   Notes:
     Requires a backport branch because we renamed svn_wc__db_kind_dir to
     svn_kind_dir for 1.8.
   Votes:
     +1: rhuijben, cmpilato, philip


r1367855 | svn-role | 2012-07-31 23:03:38 -0500 (Tue, 31 Jul 2012)

Remove the '1.7.x-r1361007' branch, reintegrated in r1367854.

r1367854 | svn-role | 2012-07-31 23:03:23 -0500 (Tue, 31 Jul 2012)

Reintegrate the 1.7.x-r1361007 branch:

 * r1361007, r1361019
   Don't record references to files in the system temp directory from
   workqueue operations from the merge code.
   Justification:
     Removes cases where a ^C can break your workqueue, because the
     diff code removes the files referenced from the workqueue in its
     pool cleanup.
   Branch: ^/subversion/branches/1.7.x-r1361007
   Notes:
     Requires a branch because the merge code has been reworked for 1.8.
   Votes:
     +1: rhuijben, cmpilato, philip


r1367853 | svn-role | 2012-07-31 23:03:17 -0500 (Tue, 31 Jul 2012)

Merge the r1354876 group from trunk:

 * r1354876, r1354907, r1355340
   Allow non-existing but valid canonical absolute paths to pass through
   svn_dirent_get_absolute().
   Justification:
     Resolves a few user reported problems.
   Notes:
     r1354907 undoes r1354876, and r1355340 fixes a return problem, so
     it is easiest to review them as a single patch.
   Votes:
     +1: rhuijben, cmpilato, philip


r1367852 | svn-role | 2012-07-31 23:03:13 -0500 (Tue, 31 Jul 2012)

Remove the '1.7.x-r1365554' branch, reintegrated in r1367851.

r1367851 | svn-role | 2012-07-31 23:02:58 -0500 (Tue, 31 Jul 2012)

Reintegrate the 1.7.x-r1365554 branch:

 * r1365549, r1365554, r1365556
   Resolve regression where 'svn revert --depth files' only operates on the
   directory
   Justification:
     Simple regression fix.
   Branch: ^/subversion/branches/1.7.x-r1365554
   Notes:
     Trivial patch in r1365554; the other patches are for adding and updating
     a regression test.
   Votes:
     +1: rhuijben, philip, steveking


r1362755 | svn-role | 2012-07-17 23:02:26 -0500 (Tue, 17 Jul 2012)

Merge r1337441 from trunk:

 * r1337441
   Fix XML namespace expansion in ra_serf
   Justification:
     Avoids segfaults caused by a malicious server sending unknown prefixes
     to ra_serf. (and corrects the semantics for a bonus win)
   Votes:
     +1: gstein, rhuijben, cmpilato


r1356567 | svn-role | 2012-07-02 23:01:31 -0500 (Mon, 02 Jul 2012)

Merge the r1338810 group from trunk:

 * r1338810, r1339164
   Fix issue #4184 ("partial svnsync drops properties when converting
   copies to adds").
   Justification:
     Syncs that don't aren't synced at all.
   Notes:
     r1338810 taught the code to send properties for demoted copies.
     r1339164 fixed a theoretical use of uninitialized memory.
   Votes:
     +1: cmpilato, rhuijben, philip


r1355849 | svn-role | 2012-06-30 23:01:29 -0500 (Sat, 30 Jun 2012)

Merge the r1293945 group from trunk:

 * r1293945, r1293972, r1293976, r1293998, r1294136, r1294236;
   r1294134, r1294147, r1294586
   Two interdependent changes:
   Fix issue #4121: copy followed by delete of unreadable child.
   Fix svn:// authz in Python tests.
   Justification:
     User resorted to patching the commit editor to work around this.
     Tests are broken.
   Notes:
     r1293945,r1293972,r1293976 are cosmetics.
     r1293998 is the fix.
     r1294136 is a test.
     r1294236 fixes an uninitialized variable.
   Notes:
     r1294134 extends a test to demonstrate its brokenness.
     r1294147 fixes said brokenness.
     r1294586 fixes r1294147 for Windows.
   Votes:
     +1: danielsh, stsp, rhuijben


r1355703 | svn-role | 2012-06-30 06:15:39 -0500 (Sat, 30 Jun 2012)

Merge r1353572 from trunk:

 * r1353572
   Fix a bug in propset which could prevent updating cached values related
   to EOL expansion in wc.db.
   Justification:
     Incorrect behaviour, subtle working copy corruption.
   Votes:
     +1: stsp, rhuijben, philip


r1355702 | svn-role | 2012-06-30 06:15:33 -0500 (Sat, 30 Jun 2012)

Remove the '1.7.x-r1348822' branch, reintegrated in r1355701.

r1355701 | svn-role | 2012-06-30 06:15:16 -0500 (Sat, 30 Jun 2012)

Reintegrate the 1.7.x-r1348822 branch:

 * r1348822, r1349215
   Fix "svn status -u --depth empty FILE"
   Justification:
     Modified file not shown as modified by above command.
     Simple fix, test included.
   Branch:
     ^/subversion/branches/1.7.x-r1348822
   Votes:
     +1: stsp, gstein, rhuijben


r1355700 | svn-role | 2012-06-30 06:15:02 -0500 (Sat, 30 Jun 2012)

Merge r1349778 from trunk:

 * r1349778
   For issue #3962, fix example output of 'svn status' shown in 'svn
   help status'.
   Justification:
     OCD.
   Votes:
     +1: cmpilato, gstein, rhuijben


r1355699 | svn-role | 2012-06-30 06:14:56 -0500 (Sat, 30 Jun 2012)

Merge r1341034 from trunk:

 * r1341034
   Sort output of 'svn propget -R' to avoid randomness with APR-1.4.6
   Justification:
     Sorted output is nicer for users. Some users even perceive random output
     order with APR-1.4.6 as a regression.
   Votes:
     +1: stsp, gstein, rhuijben


r1355698 | svn-role | 2012-06-30 06:14:50 -0500 (Sat, 30 Jun 2012)

Merge r1341031 from trunk:

 * r1341031
   Sort output of 'svn proplist' to avoid randomness with APR-1.4.6
   Justification:
     Sorted output is nicer for users. Some users even perceive random output
     order with APR-1.4.6 as a regression.
   Votes:
     +1: stsp, gstein, rhuijben


r1355631 | svn-role | 2012-06-29 23:02:12 -0500 (Fri, 29 Jun 2012)

Remove the '1.7.x-r1341012' branch, reintegrated in r1355630.

r1355630 | svn-role | 2012-06-29 23:01:54 -0500 (Fri, 29 Jun 2012)

Reintegrate the 1.7.x-r1341012 branch:

 * r1341012, r1341076
   Sort 'svn status' output to avoid randomness in output with APR-1.4.6.
   Justification:
     Sorted output is nicer for users. Some users even perceive random output
     order with APR-1.4.6 as a regression.
   Branch:
     ^/subversion/branches/1.7.x-r1341012
   Votes:
     +1: stsp, gstein, rhuijben


r1355629 | svn-role | 2012-06-29 23:01:34 -0500 (Fri, 29 Jun 2012)

Merge the r1354626 group from trunk:

 * r1354626, r1354652
   Fix JavaHL so as not to assert on non-canonical input
   Justification
     Regression from 1.6.
   Votes:
     +1: philip, markphip, rhuijben


r1355628 | svn-role | 2012-06-29 23:01:22 -0500 (Fri, 29 Jun 2012)

Merge r1351772 from trunk:

 * r1351772
   Add missing new-in-1.7 notification API enum values to JavaHL.
   Justification:
     Incomplete API in JavaHL bindings. Requested by SVNKit developers.
   Votes:
     +1: stsp, philip, markphip, rhuijben


r1349818 | svn-role | 2012-06-13 07:59:09 -0500 (Wed, 13 Jun 2012)

Merge r1340556 from trunk:

 * r1340556
   Avoid a stat per working copy find operation by statting .svn instead of two
   nodes inside .svn, per wc-directory that doesn't have a .svn directory.
   Justification:
     Very simple fix that gives the working copy find code a huge performance
     boost.
   Votes:
     +1: rhuijben, steveking, gstein


r1349817 | svn-role | 2012-06-13 07:59:06 -0500 (Wed, 13 Jun 2012)

Merge r1342984 from trunk:

 * r1342984
   Avoid a full table scan on every directory during 'svn upgrade'
   Justification:
     Makes svn upgrade unnecessary slow. Trivial fix.
   Votes:
     +1: rhuijben, steveking, gstein


r1349816 | svn-role | 2012-06-13 07:59:03 -0500 (Wed, 13 Jun 2012)

Merge r1346765 from trunk:

 * r1346765
   Allow file://C:\users\me/repos style paths as argument to svn, svnadmin and
   svnsync on Windows, like we did in 1.6. (file://%CD%/repos is nice in test
   scripts)
   Justification:
     Small regression. Easy to fix in the option parser. Fixes a privately
     reported user issue
     svnsync: Session is rooted at 'file:///C:%5CUsers%5Cme/repos/
     C:%5CUsers%5Cme/repos' but the repos root is 'file:///C:%5CUsers%5Cme/repos'
   Votes:
     +1: rhuijben, stsp, gstein


r1349815 | svn-role | 2012-06-13 07:59:00 -0500 (Wed, 13 Jun 2012)

Merge the r1349367 group from trunk:

 * r1349367, r1349371, r1349380
   Fix a bug in ra_serf that prevented it working against pre-1.2 servers.
   Justification:
     Violation of our compatibility promise.
   Votes:
     +1: cmpilato, hwright, gstein


r1349814 | svn-role | 2012-06-13 07:58:56 -0500 (Wed, 13 Jun 2012)

Merge r1345482 from trunk:

 * r1345482
   Resolve a theoretical assertion when upgrading, in case the working copy
   contains tree conflicts with a url that is not canonical in 1.7+.
   Justification:
     Upgrading should be painless.
   Votes:
     +1: rhuijben, gstein, steveking


r1337768 | svn-role | 2012-05-12 23:03:03 -0500 (Sat, 12 May 2012)

Merge the r1291594 group from trunk:

 * r1291594, r1328267, r1328268
   Support httpd-2.4 in davautocheck.
   Justification:
     Allow testing against current stable httpd.
   Notes:
     Depends on the r1327979 group.
   Votes:
     +1: philip, danielsh, gstein


r1336475 | svn-role | 2012-05-09 23:02:53 -0500 (Wed, 09 May 2012)

Merge r1335104 from trunk:

 * r1335104
   Avoid a sometimes very expensive operation in svn status' external
   processing. (issue #4178)
   Justification:
     See the "svn status <file> is slow under a large check-out" on
     users{_AT_}subversion.apache.org
   Votes:
     +1: rhuijben, stsp, philip
>>>>>>> .r1336474


r1336075 | svn-role | 2012-05-09 05:54:28 -0500 (Wed, 09 May 2012)

Remove the '1.7.x-issue4087' branch, reintegrated in r1336074.

r1336074 | svn-role | 2012-05-09 05:54:12 -0500 (Wed, 09 May 2012)

Reintegrate the 1.7.x-issue4087 branch:

 * r1164929, r1200277, r1243694, r1243840, r1243920, r1244466, r1244551, r1295372
   Workaround for issue #4087, "bogus repos_id in wc.db for file externals"
   Justification:
     Regression from 1.6. Some repositories with file externals cannot be
     checked out with 1.7. Users complained.
     See http://svn.haxx.se/users/archive-2011-12/0299.shtml
   Branch:
     ^/subversion/branches/1.7.x-issue4087
   Notes:
     r1164929 and r1200277 were merged to simplify conflict resolution
     r1243694 implements the workaround
     r1243840 is a cosmetic follow-up treak
     r1243920 was merged for conflict resolution for r1244466
     r1244466 eliminates an unneccesary RA round-trip from r1243694
     r1244551 uses a better API to query the local repos root and uuid
     r1295372 improves test coverage
   Votes:
     +1: stsp, neels
     +1: rhuijben (Fix is good, but a very noisy merge)


r1336073 | svn-role | 2012-05-09 05:53:35 -0500 (Wed, 09 May 2012)

Remove the '1.7.x-issue4166' branch, reintegrated in r1336072.

r1336072 | svn-role | 2012-05-09 05:53:19 -0500 (Wed, 09 May 2012)

Reintegrate the 1.7.x-issue4166 branch:

 * r1329417
   Fix issue #4166 'multiple merge editor drives which add then delete a
   subtree fail'.
   Justification:
     Prevents merge failure in an edge case.
   Branch:
     ^/subversion/branches/1.7.x-issue4166
   Votes:
     +1: pburba, philip, stsp


r1336071 | svn-role | 2012-05-09 05:53:08 -0500 (Wed, 09 May 2012)

Merge the r1291797 group from trunk:

 * r1291797, r1291810
   On Windows detect where perl is installed and add this information to the
   include and lib directory settings of the swig-perl projects.
   Justification:
     Allows building swig-perl without copying perl libraries manually.
     Somehow required on the Windows buildbot since the last library version
     bump.
   Votes:
     +1: rhuijben
     +0: pburba (I can't replicate the build problem, I can build with or
                 without the patch).


r1336070 | svn-role | 2012-05-09 05:53:04 -0500 (Wed, 09 May 2012)

Merge r1335555 from trunk:

 * r1335555
   Fix running the test suite with jsvn.
   Justification:
     Obvious fix. Tmate folks need this for SVNKit.
   Votes:
     +1: stsp, danielsh, rhuijben


r1331211 | svn-role | 2012-04-26 23:02:51 -0500 (Thu, 26 Apr 2012)

Remove the '1.7.x-issue4161' branch, reintegrated in r1331210.

r1331210 | svn-role | 2012-04-26 23:02:36 -0500 (Thu, 26 Apr 2012)

Reintegrate the 1.7.x-issue4161 branch:

 * r1330258
   Fix issue #4161 "Assertion failed with svn diff -r BASE:HEAD ^/trunk"
   Justification:
     Regression from 1.6. Users should not run into assertions.
   Branch:
     ^/subversion/branches/1.7.x-issue4161
   Notes:
     A previous backport of this change was incorrect and had to be reverted.
   Votes:
     +1: stsp, philip, rhuijben


r1331209 | svn-role | 2012-04-26 23:02:29 -0500 (Thu, 26 Apr 2012)

Remove the '1.7.x-r1306111' branch, reintegrated in r1331208.

r1331208 | svn-role | 2012-04-26 23:02:12 -0500 (Thu, 26 Apr 2012)

Reintegrate the 1.7.x-r1306111 branch:

 * r1306111
   Handle NULL dates in libsvn_ra_svn.
   Justification:
     Avoids segfault.
   Branch:
     ^/subversion/branches/1.7.x-r1306111
   Votes:
     +1: danielsh, stsp, rhuijben


r1331207 | svn-role | 2012-04-26 23:02:06 -0500 (Thu, 26 Apr 2012)

Merge r1190463 from trunk:

 * r1190463
   Issue 4046, "svn update --depth=empty" against 1.4 servers.
   Justification:
     Regression from 1.6.
   Votes:
     +1: philip, stsp, rhuijben


r1330653 | svn-role | 2012-04-25 23:02:19 -0500 (Wed, 25 Apr 2012)

Merge the r1200896 group from trunk:

 * r1200896, r1203977, r1205968, r1309992, r1310378, r1310428
   Various updates to the Emacs client code (dsvn.el and vc-svn.el).
   Justification:
     Make the elisp code work better with svn 1.7 and modern Emacs
     versions, and general improvements for the benefit of Emacs users.
   Votes:
     +1: mattiase
     +0: philip


r1330652 | svn-role | 2012-04-25 23:02:14 -0500 (Wed, 25 Apr 2012)

Merge r1330382 from trunk:

 * r1330382
   Fix issue 4167, 'svn st -u --xml' on items deleted from repository
   Justification:
     Regression from 1.6
   Votes:
     +1: philip, rhuijben, stsp


r1330651 | svn-role | 2012-04-25 23:02:11 -0500 (Wed, 25 Apr 2012)

Merge r1329388 from trunk:

 * r1329388
   Destroy neon request object so that request cleanups are not delayed.
   Justification:
     Undefined behaviour by using memory after free(); does not appear to
     affect 1.7 but may affect 3rd party clients using the RA API.
   Votes:
     +1: philip, rhuijben, stsp


r1330650 | svn-role | 2012-04-25 23:02:08 -0500 (Wed, 25 Apr 2012)

Merge r1329876 from trunk:

 * r1329876
   Properly report files that have just their lock removed as part of
   an update.
   Justification:
     Allows api users to use notifications to update their status cache.
     Unreported nodes are assumed to be unchanged.
   Votes:
     +1: rhuijben, stsp, philip


r1330649 | svn-role | 2012-04-25 23:02:05 -0500 (Wed, 25 Apr 2012)

Merge r1330258 from trunk:

 * r1330258
   Fix issue #4161 "Assertion failed with svn diff -r BASE:HEAD ^/trunk"
   Justification:
     Regression from 1.6. Users should not run into assertions.
   Votes:
     +1: stsp, danielsh, philip


r1330648 | svn-role | 2012-04-25 23:02:02 -0500 (Wed, 25 Apr 2012)

Merge the r1328846 group from trunk:

 * r1328846, r1328847, r1328852
   Reset some sqlite statements before returning.
   Justification:
     This avoids a bug in sqlite 3.7.11  and might fix problems for third
     party api users that call this function multiple times.
   Notes:
     r1328846 and r1328852 are the actual fix.
     r1328847 avoids fixes (and introduces) some whitepace inconsistencies.
   Votes:
     +1: rhuijben, danielsh, stsp


r1330647 | svn-role | 2012-04-25 23:01:59 -0500 (Wed, 25 Apr 2012)

Merge the r1327474 group from trunk:

 * r1327474, r1327490, r1327495, r1328353
   Allow an optional value of the delta editor to be transfered via
   mod_dav_svn, ra_serf and ra_neon.
   Justification:
     The ra layers should behave as similar as possible
   Votes:
     +1: rhuijben, philip, stsp


r1328578 | svn-role | 2012-04-20 23:01:42 -0500 (Fri, 20 Apr 2012)

Merge the r1327979 group from trunk:

 * r1327979, r1328002, r1328038, r1328144
   Avoid issue 4157: Disallow BDB with the event MPM at runtime.
   Justication:
     BDB/event causes Apache 2.4 to SEGV or spin
   Votes:
     +1: philip, danielsh, rhuijben


r1328577 | svn-role | 2012-04-20 23:01:39 -0500 (Fri, 20 Apr 2012)

Merge r1232267 from trunk:

 * r1232267
   Allow building mod_dav_svn against httpd-2.4.
   Justification:
     Support current stable httpd.
   Notes:
     Depends on the r1327979 group.
   Votes:
     +1: philip, danielsh, rhuijben


r1327812 | svn-role | 2012-04-18 23:01:35 -0500 (Wed, 18 Apr 2012)

Merge r1295007 from trunk:

 * r1295007
   Include svnrdump in the Windows build.
   Justification:
     I do not know for sure, but I assume that either make-dist.py or
     vc6-build.bat.in is actually used by some people --- and if I'm wrong,
     this would be harmless.
   Votes:
     +1: danielsh, hwright, rhuijben


r1327811 | svn-role | 2012-04-18 23:01:32 -0500 (Wed, 18 Apr 2012)

Merge r1325361 from trunk:

 * r1325361
   Avoid reading unitialised variable in propset.
   Justification:
     Undefined behaviour.
   Votes:
     +1: philip, hwright, rhuijben


r1326052 | svn-role | 2012-04-13 23:01:12 -0500 (Fri, 13 Apr 2012)

Merge the r1296251 group from trunk:

 * r1296251, r1296303, r1297522
   Resolve issue 4136, "Deep commit followed by --depth immediates update
   triggers checksum failure"
   Justification:
     User reported regression since 1.7.0
   Votes:
     +1: stsp, rhuijben, philip


r1325606 | svn-role | 2012-04-12 23:01:24 -0500 (Thu, 12 Apr 2012)

Merge r1311702 from trunk:

 * r1311702
   Prevent out-of-bounds array access during 'svn diff' arguments processing.
   Justification:
    'svn diff --old path/to/.svn --new path/to/.svn' segfaults.
   Votes:
     +1: stsp, hwright, philip


r1325605 | svn-role | 2012-04-12 23:01:20 -0500 (Thu, 12 Apr 2012)

Merge r1306334 from trunk:

 * r1306334
   Optimize failure of opening wc.db files.
   Justification:
     Takes far too much CPU when performing status on not-working copies.
     Reported as raw performance data on AnkhSVN. Probably noticable on the
     buildbot total time too.
   Votes:
     +1: rhuijben, hwright, philip


r1325604 | svn-role | 2012-04-12 23:01:16 -0500 (Thu, 12 Apr 2012)

Merge r1311935 from trunk:

 * r1311935
   Fix a pool lifetime problem in the diff code.
   Justification:
     The diff callbacks implementation relies on the diff callback driver to
     allocate path arguments from a persistent pool. While this might not be
     a problem in 1.7.x we're just lucky if it isn't. The problem should be
     fixed before somebody gets hurt.
   Votes:
     +1: stsp, hwright, philip


r1325603 | svn-role | 2012-04-12 23:01:13 -0500 (Thu, 12 Apr 2012)

Merge the r1310535 group from trunk:

 * r1310535, r1310594
   Handle APR Hash order changes in Ruby bindings test expectations.
   Justification:
     Avoid spurious test failures.
   Votes:
     +1: joeswatosh
     +0: hwright


r1325602 | svn-role | 2012-04-12 23:01:09 -0500 (Thu, 12 Apr 2012)

Merge r1298343 from trunk:

 * r1298343
   Return an error when attempting to MERGE a resource that does not exist.
   Justification:
     Avoid asserting.
   Votes:
     +1: philip, stsp, hwright


r1306145 | svn-role | 2012-03-27 23:00:32 -0500 (Tue, 27 Mar 2012)

Remove the '1.7.x-issue4144' branch, reintegrated in r1306144.

r1306144 | svn-role | 2012-03-27 23:00:16 -0500 (Tue, 27 Mar 2012)

Reintegrate the 1.7.x-issue4144 branch:

 * r1302588, r1305853
   Fix issue #4144, "Reverse merge with replace in source applies diffs
   in forward order"
   Justification:
     Pointer bug which can cause undefined behaviour during some merges.
   Branch:
     ^/subversion/branches/1.7.x-issue4144
   Votes:
     +1: stsp, philip, rhuijben


r1306143 | svn-role | 2012-03-27 23:00:10 -0500 (Tue, 27 Mar 2012)

Merge r1302417 from trunk:

 * r1302417
   Fix another ra_serf assert (MERGE fails).
   Notes: 
     This revision r1300265 originates in #4129; r1298343 originates in #3696.
   Votes:
     +1: danielsh, stsp, rhuijben


r1306142 | svn-role | 2012-03-27 23:00:07 -0500 (Tue, 27 Mar 2012)

Merge r1300265 from trunk:

 * r1300265
   Resolve issue #4130, "poor memory and file handle management when
   updating w/ externals definitions".
   Justification:
     Simple fix with noticeable scalability returns.
   Votes:
     +1: cmpilato, stsp
     +1: rhuijben (I would like a better fix, but I don't think we can do that
                   for 1.7.x)


r1305727 | svn-role | 2012-03-26 23:02:36 -0500 (Mon, 26 Mar 2012)

Merge the r1302399 group from trunk:

 * r1302399, r1302539, r1302591, r1302613
   Fix issue 4129, wrong predecessor count in FSFS revision files
   Justification:
     Repository corruption.
   Notes:
     r1302399 is a comment change.
     r1302539 and r1302591 add a test.
     r1302613 is the fix.
   Votes:
     +1: philip, danielsh, stsp


r1298264 | svn-role | 2012-03-07 22:01:23 -0600 (Wed, 07 Mar 2012)

Merge r1296369 from trunk:

 * r1296369
   Fix an off-by-one memory access.
   Votes:
     +1: danielsh, philip, rhuijben


r1296584 | svn-role | 2012-03-03 02:00:12 -0600 (Sat, 03 Mar 2012)

Merge r1292248 from trunk:

 * r1292248
   APR hash ordering fixes for the swig-py tests.
   Votes:
     +1: danielsh, jorton


r1295405 | svn-role | 2012-02-29 22:01:15 -0600 (Wed, 29 Feb 2012)

Remove the '1.7.x-issue4102' branch, reintegrated in r1295403.

r1295403 | svn-role | 2012-02-29 22:00:59 -0600 (Wed, 29 Feb 2012)

Reintegrate the 1.7.x-issue4102 branch:

 * r1233292, r1245711, r1245746, r1245764, r1245809, r1245929, r1245935, r1293577
   Fix various problems with symlinks pointing at externals (issue #4102).
   Justification:
     Regression from 1.6.x. Users complained:
     http://svn.haxx.se/users/archive-2012-02/0266.shtml
   Branch:
     ^/subversion/branches/1.7.x-issue4102
   Votes:
     +1: stsp, rhuijben, neels


r1294966 | svn-role | 2012-02-28 22:00:52 -0600 (Tue, 28 Feb 2012)

Merge r1294470 from trunk:

 * r1294470
   Include more information in the FSFS node-revision predecessors count sanity
   check.
   Justification:
     Will make chasing down the bug easier.  (I mean, asking users to run a
     Perl script that dumps node-revisions? Really?)
   Votes:
     +1: danielsh, stsp, philip


r1293814 | svn-role | 2012-02-26 05:57:23 -0600 (Sun, 26 Feb 2012)

Remove the '1.7.x-issue4123' branch, reintegrated in r1293813.

r1293813 | svn-role | 2012-02-26 05:57:23 -0600 (Sun, 26 Feb 2012)

Reintegrate the 1.7.x-issue4123 branch:

 * r1292090, r1292827
   Fix issue #4123 'URL-to-WC copy of externals fails on Windows'.
   Justification:
     URL-to-WC copies of externals are broken without this fix.  This is
     a regression from 1.6.
   Notes:
     r1292090 is a regression test and r1292827 is the fix.
   Branch:
     ^/subversion/branches/1.7.x-issue4123
   Votes:
     +1: pburba, stsp, steveking


r1293812 | svn-role | 2012-02-26 05:57:15 -0600 (Sun, 26 Feb 2012)

Merge the r1244303 group from trunk:

 * r1244303, r1244317, r1245284, r1245285
   Fix issue #4052, "merge tree-conflicts deleted symbolic links".
   Justification:
     Regression from 1.6.
     Users complained: http://mail-archives.apache.org/mod_mbox/subversion-users/201202.mbox/%3C36358219FB198140A2CD558823C1A57805374260%40NZURC101PEX1.ubsw.net%3E
   Notes:
     r1244303 and r1244317 add a test.
     r1245284 and r1245285 implement a fix.
   Votes:
     +1: stsp, julianfoad, rhuijben


r1293811 | svn-role | 2012-02-26 05:57:11 -0600 (Sun, 26 Feb 2012)

Merge r1292255 from trunk:

[ The remaining revisions in this group were merged in r1296137,
which is on the other side of cutting the 1.7.4 tag. ]

 * r1292255 r1292260 r1292296 r1292322
   APR hash unordering: swig-py tests
   Votes:
     +1: danielsh
     +0: rhuijben


r1293529 | svn-role | 2012-02-24 22:00:54 -0600 (Fri, 24 Feb 2012)

Merge r1293229 from trunk:

 * r1293229
   Fix 'svn log -g' random missing "Merged via" notifications.
   Justification:
     It's a bug, occasional log_tests 32 FAIL with new APR.
   Votes:
     +1: philip, danielsh, pburba


r1293528 | svn-role | 2012-02-24 22:00:36 -0600 (Fri, 24 Feb 2012)

Merge r1243976 from trunk:

 * r1243976
   On Windows, don't try to build mod_dontdothat if building without httpd.
   Justification:
     Regression in 1.7.2 where we added mod_dontdothat to the buildscripts
     on Windows.
   Votes:
     +1: rhuijben, ivan, pburba
     +0: cmpilato


r1293114 | svn-role | 2012-02-24 01:21:11 -0600 (Fri, 24 Feb 2012)

Merge the r1245738 group from trunk:

 * r1245738, r1245817
   Say "sqlite:" in front of SQLite's error messages.
   Justification:
     Clarify vague errors, as already done for SASL.
   Note:
     The two revisions are independent.
   Votes:
     +1: danielsh, julianfoad, cmpilato


r1293113 | svn-role | 2012-02-24 01:21:08 -0600 (Fri, 24 Feb 2012)

Merge r1238121 from trunk:

 * r1238121
   Fix incorrect url construction in libsvn_ra_serf when svn_ra_get_dir2() is
   called against a HTTPv2 server with a SVN_INVALID_REVNUM revision.
   Justification:
     Privately reported as AnkhSVN issue.
   Votes:
     +1: rhuijben, philip, cmpilato


r1293112 | svn-role | 2012-02-24 01:21:05 -0600 (Fri, 24 Feb 2012)

Remove the '1.7.x-r1210147' branch, reintegrated in r1293111.

r1293111 | svn-role | 2012-02-24 01:21:04 -0600 (Fri, 24 Feb 2012)

Reintegrate the 1.7.x-r1210147 branch:

 * r1210147, r1202132, r1202333, r1220740, r1220861
   Fix the 'svn log --diff' code so that it correctly shows a diff of a
   target file (or directory) that was at a different path in the past.
   Previously it would error out. A test is included.
   Branch:
     ^/subversion/branches/1.7.x-r1210147
   Notes:
    I previously said this (r1220740 specifically) depended on r1220783 to
    make the test pass on Windows, but it doesn't here; on trunk it does.
    r1210147 is the actual fix.
    r1202132 and r1202333 were merged for conflict resolution. These revisions
    depend on the issue #2873 fix which has been backported in 1.7.2
    r1220740 expands the test so that it would fail without r1210147 applied.
    r1220861 fixes spurious failure of the new test
   Votes:
     +1: stsp, julianfoad, cmpilato


r1242663 | svn-role | 2012-02-09 22:00:30 -0600 (Thu, 09 Feb 2012)

Remove the '1.7.x-issue4059' branch, reintegrated in r1242662.

r1242662 | svn-role | 2012-02-09 22:00:30 -0600 (Thu, 09 Feb 2012)

Reintergrate the 1.7.x-issue4059 branch:

 * r1146762, r1201419, r1227237, r1227250, r1227352, r1227372, r1227384,
   r1227385, r1239382, r1239631, r1239655, r1239749 
   Fix issue #4059, "can't commit when copy-op-root and copied-along
   grandchild are explicit targets".
   Justification:
     Some copies can't be committed. Users complained. Regression from 1.6.
   Branch:
     ^/subversion/branches/1.7.x-issue4059
   Notes:
     r1146762 avoids a semantic conflict
     r1201419 adds a regression test
     r1227237 is a comment fix
     r1227250 is an indentation fix
     r1227352 is merged to avoid a conflict and improves an error message
     r1227372 is a follow-up test fix for previous
     r1227384 prepares the actual fix and needs --accept=mine-conflict
     r1227385 is the actual fix
     r1239382 fixes the problem for nested copies, too
     r1239631 and r1239655 are follow-up comment fixes
     r1239749 fixes a performance regression on the backport branch
   Votes:
     +1: stsp, rhuijben, philip


r1242661 | svn-role | 2012-02-09 22:00:22 -0600 (Thu, 09 Feb 2012)

Merge r1241553 from trunk:

 * r1241553
   Fix the ruby bindings for svn_auth_get_platform_specific_client_providers.
   Justification:
     The bindings should see passwords cached in the platform-specific providers.
     Already fixed for the Perl bindings.  Python fix is nominated separately.
   Votes:
     +1: stsp
     +0: hwright


r1242660 | svn-role | 2012-02-09 22:00:19 -0600 (Thu, 09 Feb 2012)

Merge the r1241530 group from trunk:

 * r1241530, r1241713, r1241726
   Fix the python bindings for svn_auth_get_platform_specific_client_providers.
   Justification:
     The bindings should see passwords cached in the platform-specific providers.
     Already fixed for the Perl bindings.  Ruby fix is nominated separately.
   Notes:
     r1241713 and r1241726 tweak the unit test.
   Votes:
     +1: danielsh
     +0: hwright


r1241767 | svn-role | 2012-02-07 22:00:10 -0600 (Tue, 07 Feb 2012)

Merge r1205726 from trunk:

 * r1205726
   Plug a memory leak in the fs-base deltification logic which has
   been observed to exhaust all the available memory on a server on a
   real-world dataset.
   Justification:
     Can you say DoS?
   Votes:
     +1: cmpilato, danielsh, stsp


r1241344 | svn-role | 2012-02-06 22:00:08 -0600 (Mon, 06 Feb 2012)

Merge the r1235264 group from trunk:

 * r1235264, r1235296, r1235302, r1235736
   Fix a swig-py memory leak.
   Justification:
     Seen in the wild with significant effects.
   Notes:
     r1235264 is the fix.
     r1235296 adds a regression test.
     r1235302 is trivial / obvious fix.
     r1235736 is trivial / obvious fix.
   Votes:
     +1: danielsh
     +0: gstein


r1240893 | svn-role | 2012-02-05 22:00:17 -0600 (Sun, 05 Feb 2012)

Merge r1240752 from trunk:

 * r1240752
   Workround for a faulty APR truncate() implementation. When rep sharing
   has been activated on FSFS repositories, a rep will be truncated from
   the file after it has been found to be a duplicate of some existing rep.
   If this happens high up in the tree (in the root folder, preferrably),
   not enough data may be written afterwards (parent directories + list
   of changes in that revision) to fully overwrite the stale rep content.
   Justification:
     Rare but real source of corruption.
   Votes:
     +1: stefan2, danielsh, blair


r1240892 | svn-role | 2012-02-05 22:00:14 -0600 (Sun, 05 Feb 2012)

Merge r1240752 from trunk:

 * r1240752
   Workround for a faulty APR truncate() implementation. When rep sharing
   has been activated on FSFS repositories, a rep will be truncated from
   the file after it has been found to be a duplicate of some existing rep.
   If this happens high up in the tree (in the root folder, preferrably),
   not enough data may be written afterwards (parent directories + list
   of changes in that revision) to fully overwrite the stale rep content.
   Justification:
     Rare but real source of corruption.
   Votes:
     +1: stefan2 (via IRC), danielsh (via IRC), blair


r1240525 | svn-role | 2012-02-04 09:58:08 -0600 (Sat, 04 Feb 2012)

Merge r1227900 from trunk:

 * r1227900
   Fix build of mod_dontdothat on Windows.
   Justification:
     Failing builds are not nice. The move of mod_dontdothat from contrib
     to tools and adding it to build.conf was just backported to 1.7.x
     in r1239695.
   Votes:
     +1: jcorvel, rhuijben, pburba