Author: julianfoad
Date: Fri Feb 13 17:36:25 2015
New Revision: 1659622
URL: http://svn.apache.org/r1659622
Log:
On the '1.8.x-r1643074' branch: catch up with 1.8.x@1659621.
Modified:
subversion/branches/1.8.x-r1643074/ (props changed)
subversion/branches/1.8.x-r1643074/CHANGES (contents, props changed)
subversion/branches/1.8.x-r1643074/STATUS (contents, props changed)
subversion/branches/1.8.x-r1643074/autogen.sh
subversion/branches/1.8.x-r1643074/get-deps.sh
subversion/branches/1.8.x-r1643074/subversion/ (props changed)
subversion/branches/1.8.x-r1643074/subversion/include/private/svn_io_private.h
subversion/branches/1.8.x-r1643074/subversion/include/svn_version.h
subversion/branches/1.8.x-r1643074/subversion/libsvn_client/externals.c
subversion/branches/1.8.x-r1643074/subversion/libsvn_ra_serf/options.c
subversion/branches/1.8.x-r1643074/subversion/libsvn_subr/cache-membuffer.c
subversion/branches/1.8.x-r1643074/subversion/libsvn_subr/io.c
subversion/branches/1.8.x-r1643074/subversion/libsvn_subr/named_atomic.c
subversion/branches/1.8.x-r1643074/subversion/libsvn_subr/string.c
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/deleted-rev.c
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/file-revs.c
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/get-location-segments.c
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/get-locations.c
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/inherited-props.c
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/log.c
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/mergeinfo.c
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/repos.c
subversion/branches/1.8.x-r1643074/subversion/svnadmin/svnadmin.c
subversion/branches/1.8.x-r1643074/subversion/tests/cmdline/davautocheck.sh
subversion/branches/1.8.x-r1643074/subversion/tests/libsvn_subr/cache-test.c
subversion/branches/1.8.x-r1643074/subversion/tests/libsvn_subr/string-test.c
Propchange: subversion/branches/1.8.x-r1643074/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 13 17:36:25 2015
@@ -1,5 +1,6 @@
/subversion/branches/1.5.x-r30215:870312
/subversion/branches/1.7.x-fs-verify:1146708,1161180
+/subversion/branches/1.8.x:1643117-1659621
/subversion/branches/1.8.x-VS2013-14:1603404-1615199
/subversion/branches/1.8.x-apr-0.9:1585493-1589570
/subversion/branches/1.8.x-busted-proxy:1499222-1502434
@@ -39,7 +40,7 @@
/subversion/branches/1.8.x-r1584342:1584350-1589572
/subversion/branches/1.8.x-r1589360:1604732-1640658
/subversion/branches/1.8.x-r1594223:1594224-1606975
-/subversion/branches/1.8.x-r1611379:1612525-1640664
+/subversion/branches/1.8.x-r1611380:1647889-1657742
/subversion/branches/1.8.x-r1619774:1626728-1640478
/subversion/branches/1.8.x-r1621978:1622021-1640850
/subversion/branches/1.8.x-r1625533:1640743-1642632
@@ -125,4 +126,4 @@
/subversion/branches/uris-as-urls:1060426-1064427
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/wc-collate-path:1407642
-/subversion/trunk:1467440,1467450,1467481,1467587,1467597,1467668,1467675,1467803,1467807,1467951,1468109,1468116,1468151,1468347,1468395,1468439,1468487,1468565-1468566,1468980,1469248,1469363,1469478,1469489,1469512-1469513,1469550,1469556,1469645,1469674,1469833,1469862,1469866,1469871,1469994,1470031,1470037,1470221,1470238,1470246,1470248,1470537,1470650,1470738,1470781,1470898,1470904,1470908,1470913,1470936,1470993-1470994,1471028-1471029,1471107,1471153,1471302,1471443,1471490,1471744,1475704,1475724,1475772,1475963,1476092,1476155,1476181,1476193,1476254,1476359,1476366,1476607,1477294,1477359,1477729-1477730,1477876,1477891,1478001,1478220-1478221,1478465,1478617,1478897,1478951,1478987,1478998,1479320-1479321,1479323,1479326,1479329,1479540,1479563,1479605,1479896,1480054,1480077,1480080,1480082,1480119,1480149,1480344,1480412,1480426,1480442,1480616,1480641-1480642,1480664,1480669,1480681,1480723,1480738,1480765,1481010,1481418,1481594,1481596,1481625,1481627-1481628,148
1631-1481632,1481772,1481782,1481800,1481813,1481847,1481944,1481981,1482282,1482327,1482338,1482350,1482354,1482436,1482479,1482524,1482528,1482536,1482554,1482558,1482592,1482724,1482759,1482779,1482829,1482969-1482970,1482973,1483015,1483077,1483101,1483116,1483125,1483391,1483397,1483555,1483557,1483575,1483580,1483781,1483927,1483939,1483947,1483964-1483965,1483968,1483972,1483975,1483977,1483984,1484006,1484016-1484017,1484023,1484755,1485018,1485127,1485350,1485413,1485427,1485447,1485449,1485497,1485501,1485650,1486072,1486457,1486572,1486809,1486915,1486931,1487083,1487094,1488183,1488267,1488294,1488425,1488639,1488693,1488878,1489114,1489116-1489117,1489203,1489339,1489935,1490045,1490326,1490679,1490684,1490721,1491432,1491499,1491707,1491739,1491755-1491756,1491762,1491770,1491816,1491868,1492005,1492020,1492145,1492148,1492152,1492164,1492264,1492295,1493102,1493424,1493475,1493703,1493720,1493951,1494089,1494171,1494223,1494287,1494298,1494318,1494342,1494657,1494913,
1494967,1495063,1495104,1495204,1495209,1495214,1495256,1495329,1495428,1495432,1495446,1495597,1495805,1495850,1495978,1496007,1496110-1496111,1496127,1496132,1496151,1496470,1496938,1496957,1497002,1497318-1497319,1497551,1497614,1497804,1497975,1497980,1498000,1498012,1498136,1498449,1498455-1498456,1498483-1498484,1498486,1498550,1498564,1498851,1498885,1498997,1499034,1499044,1499064,1499095-1499096,1499100,1499403,1499423,1499438,1499447,1499460,1499470,1499483,1499492,1499496,1499498,1499595,1499727,1500074,1500175,1500226,1500680,1500695,1500762,1500799,1500801-1500802,1500904,1500928,1501199,1501207,1501656,1501702,1502097,1502267,1502577,1502777,1502811,1502901,1502909,1502952,1503009-1503010,1503058,1503061,1503211,1503318,1503528,1503884,1504192,1504505,1506040-1506041,1506047,1506058,1506966,1507044,1507382,1507567,1507589,1507889,1507891,1508438,1509186,1509196,1511057,1511272,1511353,1511603,1512067,1512119,1512195,1512300-1512301,1512432,1512471-1512472,1513119,15131
22,1513156,1513463,1513472,1513874,1513879-1513880,1513943,1514295,1514315,1514318,1514356,1514628,1514763,1514785,1514804,1515119,1515141,1515201,1515225,1515237,1515343,1515366,1515516,1515534,1515721,1515992,1515997,1516023-1516024,1516049,1516051-1516053,1516071,1516271,1516429,1516556,1516565,1516567,1516806,1518184,1518942,1519615,1519617,1519733,1519816,1519823,1519955,1520065,1520529,1520532,1520539,1520745,1522892,1523666,1524869,1525902,1526439,1526655,1527103,1527105,1530763,1530768,1530872,1530922,1530967,1531002,1531004,1531014,1531938,1532023,1532098,1532316,1534102,1534149,1534158,1534713,1534737,1534860,1535115,1535161,1535532,1535610,1535676,1536350,1536383,1536464,1536488,1536537,1536914,1536931,1537018,1537147,1537190,1537193,1537221,1537263,1537360,1537415,1537555,1537700,1538516-1538517,1538519,1538574,1538581,1538812,1538925,1538928,1538939,1540044,1540417,1540752,1541432,1541635,1541638,1541705,1541790,1542042,1542069,1542071,1542119,1542129,1542138,1542146,15
42151,1542610,1542765,1542767,1542774,1543145,1543187,1543413,1543594,1543961,1544295,1544316,1544597,1544600,1544688,1544690,1544878,1544895,1545111,1545122,1545302,1545835,1545845,1547252,1547454,1547774,1547866,1547873,1548097,1548105,1548170,1548486,1548673,1549858,1549874,1550691,1550772,1550803,1551524,1551579,1552957-1552958,1553101,1553105,1553113,1553376-1553377,1553501,1553556,1554978,1555403,1555499,1557320,1557522,1559009,1559197,1560690,1560701,1561426,1561703,1563110,1564292,1564576,1564966,1564969,1565085,1565531,1566503-1566504,1567064,1567109,1567134,1567204,1567228,1567286,1567392,1567492,1567494,1567740,1567752,1567985,1568070,1568180,1568349,1568361,1568872,1568953,1568955,1569069,1570642,1571214,1571747,1571787,1571795,1572102,1572200,1572340,1573088,1573106,1573209,1574868,1575270,1575284,1575525,1575915,1577151,1577200,1577294,1577739,1577755,1577812-1577813,1578273,1578311,1578326,1578670,1578820,1578853,1578875,1579274,1579429,1579588,1579684,1580626,1580650
,1580832,1580867,1580872,1581296,1581305,1581315,1581430,1581810,1583580,1583977,1584342,1584576,1584592,1584745,1585686,1586052,1586255,1586352,1586467,1587511,1587946,1587968,1588772,1588778,1589184,1589188,1589360,1589460,1589486,1590212,1591123,1592014,1592034,1593992,1594156,1594223,1594794,1594814,1594834,1595061,1595431,1596866,1600311,1600315,1600323,1600331,1600348,1600368,1600393,1600563,1600781,1600909,1601851,1606009,1611379,1612225,1612405,1615211,1615219,1615255-1615256,1615260,1615263,1615354,1616131,1617687,1619105,1619118,1619153,1619774,1619802,1620332,1621978,1621981,1625533,1625537,1628431,1628536,1628540,1633126,1636874,1637826,1640730,1641564,1643074
+/subversion/trunk:1467440,1467450,1467481,1467587,1467597,1467668,1467675,1467803,1467807,1467951,1468109,1468116,1468151,1468347,1468395,1468439,1468487,1468565-1468566,1468980,1469248,1469363,1469478,1469489,1469512-1469513,1469550,1469556,1469645,1469674,1469833,1469862,1469866,1469871,1469994,1470031,1470037,1470221,1470238,1470246,1470248,1470537,1470650,1470738,1470781,1470898,1470904,1470908,1470913,1470936,1470993-1470994,1471028-1471029,1471107,1471153,1471302,1471443,1471490,1471744,1475704,1475724,1475772,1475963,1476092,1476155,1476181,1476193,1476254,1476359,1476366,1476607,1477294,1477359,1477729-1477730,1477876,1477891,1478001,1478220-1478221,1478465,1478617,1478897,1478951,1478987,1478998,1479320-1479321,1479323,1479326,1479329,1479540,1479563,1479605,1479896,1480054,1480077,1480080,1480082,1480119,1480149,1480344,1480412,1480426,1480442,1480616,1480641-1480642,1480664,1480669,1480681,1480723,1480738,1480765,1481010,1481418,1481594,1481596,1481625,1481627-1481628,148
1631-1481632,1481772,1481782,1481800,1481813,1481847,1481944,1481981,1482282,1482327,1482338,1482350,1482354,1482436,1482479,1482524,1482528,1482536,1482554,1482558,1482592,1482724,1482759,1482779,1482829,1482969-1482970,1482973,1483015,1483077,1483101,1483116,1483125,1483391,1483397,1483555,1483557,1483575,1483580,1483781,1483927,1483939,1483947,1483964-1483965,1483968,1483972,1483975,1483977,1483984,1484006,1484016-1484017,1484023,1484755,1485018,1485127,1485350,1485413,1485427,1485447,1485449,1485497,1485501,1485650,1486072,1486457,1486572,1486809,1486915,1486931,1487083,1487094,1488183,1488267,1488294,1488425,1488639,1488693,1488878,1489114,1489116-1489117,1489203,1489339,1489935,1490045,1490326,1490679,1490684,1490721,1491432,1491499,1491707,1491739,1491755-1491756,1491762,1491770,1491816,1491868,1492005,1492020,1492145,1492148,1492152,1492164,1492264,1492295,1493102,1493424,1493475,1493703,1493720,1493951,1494089,1494171,1494223,1494287,1494298,1494318,1494342,1494657,1494913,
1494967,1495063,1495104,1495204,1495209,1495214,1495256,1495329,1495428,1495432,1495446,1495597,1495805,1495850,1495978,1496007,1496110-1496111,1496127,1496132,1496151,1496470,1496938,1496957,1497002,1497318-1497319,1497551,1497614,1497804,1497975,1497980,1498000,1498012,1498136,1498449,1498455-1498456,1498483-1498484,1498486,1498550,1498564,1498851,1498885,1498997,1499034,1499044,1499064,1499095-1499096,1499100,1499403,1499423,1499438,1499447,1499460,1499470,1499483,1499492,1499496,1499498,1499595,1499727,1500074,1500175,1500226,1500680,1500695,1500762,1500799,1500801-1500802,1500904,1500928,1501199,1501207,1501656,1501702,1502097,1502267,1502577,1502777,1502811,1502901,1502909,1502952,1503009-1503010,1503058,1503061,1503211,1503318,1503528,1503884,1504192,1504505,1506040-1506041,1506047,1506058,1506966,1507044,1507382,1507567,1507589,1507889,1507891,1508438,1509186,1509196,1511057,1511272,1511353,1511603,1512067,1512119,1512195,1512300-1512301,1512432,1512471-1512472,1513119,15131
22,1513156,1513463,1513472,1513874,1513879-1513880,1513943,1514295,1514315,1514318,1514356,1514628,1514763,1514785,1514804,1515119,1515141,1515201,1515225,1515237,1515343,1515366,1515516,1515534,1515721,1515992,1515997,1516023-1516024,1516049,1516051-1516053,1516071,1516271,1516429,1516556,1516565,1516567,1516806,1518184,1518942,1519615,1519617,1519733,1519816,1519823,1519955,1520065,1520529,1520532,1520539,1520745,1522892,1523666,1524869,1525902,1526439,1526655,1527103,1527105,1530763,1530768,1530872,1530922,1530967,1531002,1531004,1531014,1531938,1532023,1532098,1532316,1534102,1534149,1534158,1534713,1534737,1534860,1535115,1535161,1535532,1535610,1535676,1536350,1536383,1536464,1536488,1536537,1536914,1536931,1537018,1537147,1537190,1537193,1537221,1537263,1537360,1537415,1537555,1537700,1538516-1538517,1538519,1538574,1538581,1538812,1538925,1538928,1538939,1540044,1540417,1540752,1541432,1541635,1541638,1541705,1541790,1542042,1542069,1542071,1542119,1542129,1542138,1542146,15
42151,1542610,1542765,1542767,1542774,1543145,1543187,1543413,1543594,1543961,1544295,1544302-1544303,1544316,1544597,1544600,1544688,1544690,1544878,1544895,1545111,1545122,1545302,1545835,1545845,1547252,1547454,1547774,1547866,1547873,1548097,1548105,1548170,1548486,1548673,1549858,1549874,1550691,1550772,1550803,1551524,1551579,1552957-1552958,1553101,1553105,1553113,1553376-1553377,1553501,1553556,1554978,1555403,1555499,1557320,1557522,1559009,1559197,1560690,1560701,1561426,1561703,1563110,1564292,1564576,1564966,1564969,1565085,1565531,1566503-1566504,1567064,1567109,1567134,1567204,1567228,1567286,1567392,1567492,1567494,1567740,1567752,1567985,1568070,1568180,1568349,1568361,1568872,1568953,1568955,1569069,1570642,1571214,1571747,1571787,1571795,1572102,1572200,1572340,1573088,1573106,1573209,1574868,1575270,1575284,1575525,1575915,1577151,1577200,1577294,1577739,1577755,1577812-1577813,1578273,1578311,1578326,1578670,1578820,1578853,1578875,1579274,1579429,1579588,1579684
,1580626,1580650,1580832,1580867,1580872,1581296,1581305,1581315,1581430,1581810,1583580,1583977,1584342,1584576,1584592,1584745,1585686,1586052,1586255,1586352,1586467,1587511,1587946,1587968,1588772,1588778,1589184,1589188,1589360,1589460,1589486,1590212,1591123,1592014,1592034,1593992,1594156,1594223,1594794,1594814,1594834,1595061,1595431,1596866,1600311,1600315,1600323,1600331,1600348,1600368,1600393,1600563,1600781,1600909,1601851,1606009,1611380-1611381,1612225,1615211,1615219,1615255-1615256,1615260,1615263,1616131,1619071,1619105,1619118,1619153,1619774,1619802,1620332,1621978,1621981,1625533,1625537,1628431,1628536,1628540,1633126,1636874,1637826,1640730,1640862,1640873,1641564,1643033,1643074,1643409,1643437,1643457,1643461,1643482,1643793,1643810,1643972-1643973,1647339,1650481,1650489,1650834,1653039,1655712,1655738
Modified: subversion/branches/1.8.x-r1643074/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1643074/CHANGES?rev=1659622&r1=1659621&r2=1659622&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1643074/CHANGES (original)
+++ subversion/branches/1.8.x-r1643074/CHANGES Fri Feb 13 17:36:25 2015
@@ -1,3 +1,48 @@
+Version 1.8.11
+(15 Dec 2014, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.10
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * checkout/update: fix file externals failing to follow history and
+ subsequently silently failing (issue #4185)
+ * patch: don't skip targets in valid --git difs (r1592014, r1592034)
+ * diff: make property output in diffs stable (r1589360)
+ * diff: fix diff of local copied directory with props (r1619380, r1619393)
+ * diff: fix changelist filter for repos-WC and WC-WC (r1621978, r1621981)
+ * remove broken conflict resolver menu options that always error out
+ (r1620332)
+ * improve gpg-agent support (r1600331, r1600348, 1600368, r1600563,
+ r1600781)
+ * fix crash in eclipse IDE with GNOME Keyring (issue #3498)
+ * fix externals shadowing a versioned directory (issue #4085)
+ * fix problems working on unix file systems that don't support
+ permissions (r1612225)
+ * upgrade: keep external registrations (issue #4519)
+ * cleanup: iprove performance of recorded timestamp fixups (r1633126)
+ * translation updates for German
+
+ - Server-side bugfixes:
+ * disable revprop caching feature due to cache invalidation problems
+ (r1543594, r1619774, r1619105, r1619118, r1619153, r1619802)
+ * skip generating uniquifiers if rep-sharing is not supported (r1561426)
+ * mod_dav_svn: reject requests with missing repository paths (r1643409)
+ * mod_dav_svn: reject requests with invalid virtual transaction names
+ (r1643437)
+ * mod_dav_svn: avoid unneeded memory growth in resource walking
+ (issue #4531)
+
+ Developer-visible changes:
+ - General:
+ * make sure all members of the repos layer notify struct are valid,
+ fixes crashes in API users using all members (r1616131)
+ * properly generate a version resource when building on Windows (r1542610,
+ r1564576, r1568180)
+ * fix LIBTOOL_M4 and LIBTOOL_CONFIG variable not be evaluated properly
+ during a unix build (r1637826)
+ * allow the use of libtool 2.4.3 (r1640862, r1640873, r1643793)
+
+
Version 1.8.10
(11 Aug 2014, from /branches/1.8.x)
http://svn.apache.org/repos/asf/subversion/tags/1.8.10
@@ -729,6 +774,39 @@ http://svn.apache.org/repos/asf/subversi
* fix some reference counting bugs in swig-py bindings (r1464899, r1466524)
+Version 1.7.19
+(15 Dec 2014, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.19
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * rm: display the proper URL in commit log editor (r1591123)
+ * diff: fix invalid read during suffix scanning (issue #4339)
+ * fix crash in eclipse IDE with GNOME Keyring (issue #3498)
+ * checkout/update: fix file externals failing to follow history and
+ subsequently silently failing (issue #4185)
+
+ - Server-side bugfixes:
+ * svnadmin dump: don't let invalid mergeinfo prevent a dump (issue #4476)
+ * mod_dav_svn: reject requests with missing repository paths (r1643409)
+ * mod_dav_svn: reject requests with invalid virtual transaction names
+ (r1643437)
+ * mod_dav_svn: avoid unneeded memory growth in resource walking
+ (issue #4531)
+
+ Developer-visible changes:
+ - General:
+ * properly generate a version resource when building on Windows (r1542610,
+ r1564576, r1568180)
+ * fix a problem with the unix build that could result in linking to the
+ wrong Subversion libraries at build or at run time (r1594157)
+ * use a proper intermediate directory when building with Visual Studio
+ 2003-2008 (r1595431)
+ * fix LIBTOOL_M4 and LIBTOOL_CONFIG variable not be evaluated properly
+ during a unix build (r1637826)
+ * allow the use of libtool 2.4.3 (r1640862, r1640873, r1643793)
+
+
Version 1.7.18
(11 Aug 2014, from /branches/1.7.x)
http://svn.apache.org/repos/asf/subversion/tags/1.7.18
Propchange: subversion/branches/1.8.x-r1643074/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 13 17:36:25 2015
@@ -1,5 +1,6 @@
/subversion/branches/1.5.x-r30215/CHANGES:870312
/subversion/branches/1.7.x-fs-verify/CHANGES:1146708,1161180
+/subversion/branches/1.8.x/CHANGES:1643117-1659621
/subversion/branches/1.8.x-issue4437/CHANGES:1567249-1591140
/subversion/branches/1.8.x-r1477876/CHANGES:1477981-1478008
/subversion/branches/1.8.x-r1481625/CHANGES:1481637-1482135
@@ -76,4 +77,4 @@
/subversion/branches/uris-as-urls/CHANGES:1060426-1064427
/subversion/branches/verify-at-commit/CHANGES:1462039-1462408
/subversion/branches/wc-collate-path/CHANGES:1407642
-/subversion/trunk/CHANGES:1467414-1483608,1485413,1485427,1485497,1485501,1485508,1486572,1488639,1491499,1497998,1498028,1501807,1502724,1502727,1502729,1503782,1503795-1503796,1503849-1503850,1503905,1513943,1515237,1515992,1515997,1516023-1516024,1516049,1516051-1516053,1516071,1516565,1516567,1534713,1534737,1541705,1542119,1542129,1542138,1542146,1542151,1564292,1564966,1564969,1565085,1565530,1567740,1568070,1569069,1573006,1585453,1586333,1590212,1591156,1591168,1615255-1615256,1615260
+/subversion/trunk/CHANGES:1467414-1483608,1485413,1485427,1485497,1485501,1485508,1486572,1488639,1491499,1497998,1498028,1501807,1502724,1502727,1502729,1503782,1503795-1503796,1503849-1503850,1503905,1513943,1515237,1515992,1515997,1516023-1516024,1516049,1516051-1516053,1516071,1516565,1516567,1534713,1534737,1541705,1542119,1542129,1542138,1542146,1542151,1564292,1564966,1564969,1565085,1565530,1567740,1568070,1569069,1573006,1585453,1586333,1590212,1591156,1591168,1615255-1615256,1615260,1643033,1643457,1643461,1643972-1643973
Modified: subversion/branches/1.8.x-r1643074/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1643074/STATUS?rev=1659622&r1=1659621&r2=1659622&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1643074/STATUS (original)
+++ subversion/branches/1.8.x-r1643074/STATUS Fri Feb 13 17:36:25 2015
@@ -10,7 +10,7 @@ See http://subversion.apache.org/docs/co
for details on how release lines and voting work, what kinds of bugs can
delay a release, etc.
-Status of 1.8.11:
+Status of 1.8.12:
Candidate changes:
==================
@@ -41,21 +41,10 @@ Candidate changes:
this patch, there is no way except of 'svnadmin load' to know that these
dump files will load at all. With this patch, a successful verify run
should guarantee loadable dump files.
- Branch: ^/subversion/branches/1.8.x-r1536854
- Votes:
- +1: stefan2, breser
-
- * r1555491
- Fix svn_fs_close_root for FSFS transaction roots.
- Justification:
- Without this patch, cache-related pool cleanups may be run after the
- svn_fs_t object has been destroyed. I.e. even with explicit calls to
- svn_fs_close_root, the user may see a segfault.
Branch:
- ^/subversion/branches/1.8.x-r1555491
+ ^/subversion/branches/1.8.x-r1536854
Votes:
- +1: stefan2
- -0: philip, rhuijben (Seems to be a different name for the same pool?)
+ +1: stefan2, breser
* r1590751
Use empty, rather than NULL, config if default is unreadable.
@@ -81,6 +70,23 @@ Candidate changes:
Votes:
+1: stefan2
+ * 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-r1619380
+ Votes:
+ +1: rhuijben
+ +0: julianfoad (previously said +1 with the wrong branch mentioned)
+ +0: stefan2 (previously said +1 with the wrong branch mentioned)
+
* r1643074
Don't let invalid mergeinfo stop 'svnadmin load' from working.
Part of issue #4476 "Mergeinfo containing r0 makes svnsync and svnadmin
@@ -95,7 +101,86 @@ Candidate changes:
Branch:
^/subversion/branches/1.8.x-r1643074
Votes:
- +1: julianfoad
+ +1: julianfoad, philip
+
+ * 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
+
+ * 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
+
+ * r1650531
+ Fix a redirect handling bug in 'svn log' over HTTP.
+ Justification:
+ Redirects should work.
+ Notes:
+ Merge with --accept tc
+ Votes:
+ +1: stsp, philip
+
+ * 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
+
+ * 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
+
+ * r1654932, r1654933, r1654934, r1654937
+ Fix issue #4554, "0 file length reported in FSFS".
+ Justification:
+ This causes 'svnadmin dump' to create corrupted output that fails to
+ load and we provide no way to detect that problem other than loading
+ the respective dump. We also want to prevent further instances of
+ that issue to be added to the repository.
+ Notes:
+ r1561419 has been removed from this change set and proposed for a
+ separate backport because it is not a necessary part of the #4554 fix.
+ Branch:
+ ^/subversion/branches/1.8.x-issue4554
+ Votes:
+ +1: stefan2
+ +0: rhuijben (patch looks sane, but hard to oversee consequences)
+
+ * 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
+
+ * 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
Veto-blocked changes:
=====================
@@ -110,5 +195,74 @@ Veto-blocked changes:
+1: stsp
-1: breser (see my email to dev@, <[email protected]>)
+ * 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.8.x-issue4551
+ Notes:
+ r1653988, r1654039, r1654271 contain the fixes; the rest are adding tests.
+ Votes:
+ +1: julianfoad, rhuijben
+ -1: philip (uses apr_hash_key this without the neccessary backport
support)
+
+ * r1646230, r1646250, r1646253
+ 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:
+ r1646250 contains the fix itself, and a test for it.
+ r1646253 removes some stray debug statements.
+ r1646230 is required for the test to work.
+ r1643074 (nominated separately) is required for the test to work.
+ I would recommend not backporting r1646250 without r1643074.
+ This is also nominated for 1.7.x.
+ Votes:
+ +1: julianfoad
+ -1: philip (deletes mergeinfo that doesn't contain r0)
+
Approved changes:
=================
+
+ * 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
+
+ * r1651759
+ Api correctness fix: Duplicate error filename when copying errors
+ Justification:
+ Simple to fix issue caused error on buildbot.
+ Votes:
+ +1: rhuijben, ivan, philip
+
+ * 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
+
+ * 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
+
+ * 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
Propchange: subversion/branches/1.8.x-r1643074/STATUS
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Feb 13 17:36:25 2015
@@ -0,0 +1,130 @@
+/subversion/branches/1.5.x-r30215/STATUS:870312
+/subversion/branches/1.7.x-fs-verify/STATUS:1146708,1161180
+/subversion/branches/1.8.x/STATUS:1643117-1659621
+/subversion/branches/1.8.x-VS2013-14/STATUS:1603404-1615199
+/subversion/branches/1.8.x-apr-0.9/STATUS:1585493-1589570
+/subversion/branches/1.8.x-busted-proxy/STATUS:1499222-1502434
+/subversion/branches/1.8.x-gpg-agent/STATUS:1600789-1640662
+/subversion/branches/1.8.x-issue4400/STATUS:1507591-1512557
+/subversion/branches/1.8.x-issue4437/STATUS:1567249-1591140
+/subversion/branches/1.8.x-issue4448/STATUS:1540420-1541802
+/subversion/branches/1.8.x-issue4480/STATUS:1588773-1591136
+/subversion/branches/1.8.x-javahl-exception-crash/STATUS:1586424-1588151
+/subversion/branches/1.8.x-libsvnjavahl-version/STATUS:1483910-1485054
+/subversion/branches/1.8.x-openssl-dirs/STATUS:1535137-1540436
+/subversion/branches/1.8.x-r1477876/STATUS:1477981-1487716
+/subversion/branches/1.8.x-r1481625/STATUS:1481637-1482135
+/subversion/branches/1.8.x-r1495063/STATUS:1495804-1501074
+/subversion/branches/1.8.x-r1497310-partial/STATUS:1497500-1501063
+/subversion/branches/1.8.x-r1502267/STATUS:1502268-1515998
+/subversion/branches/1.8.x-r1507044/STATUS:1507282-1511571
+/subversion/branches/1.8.x-r1513879/STATUS:1514699-1516021
+/subversion/branches/1.8.x-r1536931/STATUS:1536934-1591145
+/subversion/branches/1.8.x-r1537147/STATUS:1537201-1537216
+/subversion/branches/1.8.x-r1537193/STATUS:1537217-1541815
+/subversion/branches/1.8.x-r1541790/STATUS:1541791-1542075
+/subversion/branches/1.8.x-r1544597/STATUS:1564547-1591149
+/subversion/branches/1.8.x-r1554978/STATUS:1555500-1565076
+/subversion/branches/1.8.x-r1561426/STATUS:1561547-1640480
+/subversion/branches/1.8.x-r1564215/STATUS:1564281-1564620
+/subversion/branches/1.8.x-r1567286/STATUS:1567364-1567731
+/subversion/branches/1.8.x-r1567985/STATUS:1568016-1568055
+/subversion/branches/1.8.x-r1574868/STATUS:1575329-1579873
+/subversion/branches/1.8.x-r1577151/STATUS:1589064-1589574
+/subversion/branches/1.8.x-r1577812/STATUS:1577814-1588145
+/subversion/branches/1.8.x-r1578311/STATUS:1578312-1589576
+/subversion/branches/1.8.x-r1578853/STATUS:1578879-1581682
+/subversion/branches/1.8.x-r1579588/STATUS:1579589-1591112
+/subversion/branches/1.8.x-r1580626/STATUS:1580631,1580652,1580661,1581435,1588382-1591134
+/subversion/branches/1.8.x-r1581305/STATUS:1581320-1582587
+/subversion/branches/1.8.x-r1584342/STATUS:1584350-1589572
+/subversion/branches/1.8.x-r1589360/STATUS:1604732-1640658
+/subversion/branches/1.8.x-r1594223/STATUS:1594224-1606975
+/subversion/branches/1.8.x-r1611379/STATUS:1612525-1640664
+/subversion/branches/1.8.x-r1611380/STATUS:1647889-1657742
+/subversion/branches/1.8.x-r1619774/STATUS:1626728-1640478
+/subversion/branches/1.8.x-r1621978/STATUS:1622021-1640850
+/subversion/branches/1.8.x-r1625533/STATUS:1640743-1642632
+/subversion/branches/1.8.x-r1633126/STATUS:1633130-1642634
+/subversion/branches/1.8.x-r1641564/STATUS:1641570-1642636
+/subversion/branches/1.8.x-r175-daemonize/STATUS:1515866-1516020
+/subversion/branches/1.8.x-rm-external-dir/STATUS:1600632-1615197
+/subversion/branches/1.8.x-serf-1.3+-windows/STATUS:1517122-1533873
+/subversion/branches/1.8.x-serf-no-lock-support/STATUS:1584583-1591109
+/subversion/branches/1.8.x-svn_fs_info-removal/STATUS:1467420-1468159
+/subversion/branches/1.8.x-svnsync-serf-memory/STATUS:1515248-1515701
+/subversion/branches/1.8.x-synvsync-serf-memory/STATUS:1515247
+/subversion/branches/1.8.x-tristate-chunked-request/STATUS:1502435-1503894
+/subversion/branches/10Gb/STATUS:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
+/subversion/branches/atomic-revprop/STATUS:965046-1000689
+/subversion/branches/auto-props-sdc/STATUS:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/STATUS:872050-872529
+/subversion/branches/diff-callbacks3/STATUS:870059-870761
+/subversion/branches/diff-optimizations/STATUS:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/STATUS:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/STATUS:870728-871118
+/subversion/branches/double-delete/STATUS:870511-872970
+/subversion/branches/ev2-export/STATUS:1325914,1332738,1413107
+/subversion/branches/explore-wc/STATUS:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals/STATUS:871779-873302
+/subversion/branches/fs-rep-sharing/STATUS:869036-873803
+/subversion/branches/fsfs-pack/STATUS:873717-874575
+/subversion/branches/gnome-keyring/STATUS:870558-871410
+/subversion/branches/gpg-agent-password-store/STATUS:1005036-1150766
+/subversion/branches/http-protocol-v2/STATUS:874395-876041
+/subversion/branches/in-memory-cache/STATUS:869829-871452
+/subversion/branches/in-repo-authz/STATUS:1414342-1424779
+/subversion/branches/inheritable-props/STATUS:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/STATUS:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/STATUS:998649-998852
+/subversion/branches/integrate-compression-level/STATUS:1068651-1072287
+/subversion/branches/integrate-io-improvements/STATUS:1068684-1072297
+/subversion/branches/integrate-is-cachable/STATUS:1072568-1074082
+/subversion/branches/integrate-partial-getter/STATUS:1072558-1076552
+/subversion/branches/integrate-readline-speedup/STATUS:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/STATUS:1068695-1072516
+/subversion/branches/integrate-string-improvements/STATUS:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/STATUS:1072541-1078213
+/subversion/branches/issue-2779-dev/STATUS:965496-984198
+/subversion/branches/issue-2843-dev/STATUS:871432-874179
+/subversion/branches/issue-3000/STATUS:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/STATUS:873375-874084
+/subversion/branches/issue-3148-dev/STATUS:875193-875204
+/subversion/branches/issue-3220-dev/STATUS:872210-872226
+/subversion/branches/issue-3242-dev/STATUS:879653-896436
+/subversion/branches/issue-3334-dirs/STATUS:875156-875867
+/subversion/branches/issue-3975/STATUS:1152931-1160746
+/subversion/branches/issue-4116-dev/STATUS:1424719-1425040
+/subversion/branches/issue-4194-dev/STATUS:1410507-1414880
+/subversion/branches/javahl-ra/STATUS:1342682,1344977
+/subversion/branches/kwallet/STATUS:870785-871314
+/subversion/branches/log-g-performance/STATUS:870941-871032
+/subversion/branches/merge-skips-obstructions/STATUS:874525-874615
+/subversion/branches/multi-layer-moves/STATUS:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/STATUS:870276,870376
+/subversion/branches/node_pool/STATUS:1304828-1305388
+/subversion/branches/performance/STATUS:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985673,985695,985697,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,1029335-1029336,1029339-1029340,102
9342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/py-tests-as-modules/STATUS:956579-1033052
+/subversion/branches/ra_serf-digest-authn/STATUS:875693-876404
+/subversion/branches/reintegrate-improvements/STATUS:873853-874164
+/subversion/branches/revprop-cache/STATUS:1298521-1326293
+/subversion/branches/revprop-packing/STATUS:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/subtree-mergeinfo/STATUS:876734-878766
+/subversion/branches/svn-mergeinfo-enhancements/STATUS:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/STATUS:918519-934609
+/subversion/branches/svn_mutex/STATUS:1141683-1182099
+/subversion/branches/svnpatch-diff/STATUS:865738-876477
+/subversion/branches/svnraisetc/STATUS:874709-875149
+/subversion/branches/svnserve-logging/STATUS:869828-870893
+/subversion/branches/tc-issue-3334/STATUS:874697-874773
+/subversion/branches/tc-merge-notify/STATUS:874017-874062
+/subversion/branches/tc-resolve/STATUS:874191-874239
+/subversion/branches/tc_url_rev/STATUS:874351-874483
+/subversion/branches/tree-conflicts/STATUS:868291-873154
+/subversion/branches/tree-conflicts-notify/STATUS:873926-874008
+/subversion/branches/tristate-chunked-request/STATUS:1502401,1502673
+/subversion/branches/tweak-build-take-two/STATUS:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/STATUS:1060426-1064427
+/subversion/branches/verify-at-commit/STATUS:1462039-1462408
+/subversion/branches/wc-collate-path/STATUS:1407642
+/subversion/trunk/STATUS:1467440,1467450,1467481,1467587,1467597,1467668,1467675,1467803,1467807,1467951,1468109,1468116,1468151,1468347,1468395,1468439,1468487,1468565-1468566,1468980,1469248,1469363,1469478,1469489,1469512-1469513,1469550,1469556,1469645,1469674,1469833,1469862,1469866,1469871,1469994,1470031,1470037,1470221,1470238,1470246,1470248,1470537,1470650,1470738,1470781,1470898,1470904,1470908,1470913,1470936,1470993-1470994,1471028-1471029,1471107,1471153,1471302,1471443,1471490,1471744,1475704,1475724,1475772,1475963,1476092,1476155,1476181,1476193,1476254,1476359,1476366,1476607,1477294,1477359,1477729-1477730,1477876,1477891,1478001,1478220-1478221,1478465,1478617,1478897,1478951,1478987,1478998,1479320-1479321,1479323,1479326,1479329,1479540,1479563,1479605,1479896,1480054,1480077,1480080,1480082,1480119,1480149,1480344,1480412,1480426,1480442,1480616,1480641-1480642,1480664,1480669,1480681,1480723,1480738,1480765,1481010,1481418,1481594,1481596,1481625,1481627-1481
628,1481631-1481632,1481772,1481782,1481800,1481813,1481847,1481944,1481981,1482282,1482327,1482338,1482350,1482354,1482436,1482479,1482524,1482528,1482536,1482554,1482558,1482592,1482724,1482759,1482779,1482829,1482969-1482970,1482973,1483015,1483077,1483101,1483116,1483125,1483391,1483397,1483555,1483557,1483575,1483580,1483781,1483927,1483939,1483947,1483964-1483965,1483968,1483972,1483975,1483977,1483984,1484006,1484016-1484017,1484023,1484755,1485018,1485127,1485350,1485413,1485427,1485447,1485449,1485497,1485501,1485650,1486072,1486457,1486572,1486809,1486915,1486931,1487083,1487094,1488183,1488267,1488294,1488425,1488639,1488693,1488878,1489114,1489116-1489117,1489203,1489339,1489935,1490045,1490326,1490679,1490684,1490721,1491432,1491499,1491707,1491739,1491755-1491756,1491762,1491770,1491816,1491868,1492005,1492020,1492145,1492148,1492152,1492164,1492264,1492295,1493102,1493424,1493475,1493703,1493720,1493951,1494089,1494171,1494223,1494287,1494298,1494318,1494342,1494657,1
494913,1494967,1495063,1495104,1495204,1495209,1495214,1495256,1495329,1495428,1495432,1495446,1495597,1495805,1495850,1495978,1496007,1496110-1496111,1496127,1496132,1496151,1496470,1496938,1496957,1497002,1497318-1497319,1497551,1497614,1497804,1497975,1497980,1498000,1498012,1498136,1498449,1498455-1498456,1498483-1498484,1498486,1498550,1498564,1498851,1498885,1498997,1499034,1499044,1499064,1499095-1499096,1499100,1499403,1499423,1499438,1499447,1499460,1499470,1499483,1499492,1499496,1499498,1499595,1499727,1500074,1500175,1500226,1500680,1500695,1500762,1500799,1500801-1500802,1500904,1500928,1501199,1501207,1501656,1501702,1502097,1502267,1502577,1502777,1502811,1502901,1502909,1502952,1503009-1503010,1503058,1503061,1503211,1503318,1503528,1503884,1504192,1504505,1506040-1506041,1506047,1506058,1506966,1507044,1507382,1507567,1507589,1507889,1507891,1508438,1509186,1509196,1511057,1511272,1511353,1511603,1512067,1512119,1512195,1512300-1512301,1512432,1512471-1512472,151311
9,1513122,1513156,1513463,1513472,1513874,1513879-1513880,1513943,1514295,1514315,1514318,1514356,1514628,1514763,1514785,1514804,1515119,1515141,1515201,1515225,1515237,1515343,1515366,1515516,1515534,1515721,1515992,1515997,1516023-1516024,1516049,1516051-1516053,1516071,1516271,1516429,1516556,1516565,1516567,1516806,1518184,1518942,1519615,1519617,1519733,1519816,1519823,1519955,1520065,1520529,1520532,1520539,1520745,1522892,1523666,1524869,1525902,1526439,1526655,1527103,1527105,1530763,1530768,1530872,1530922,1530967,1531002,1531004,1531014,1531938,1532023,1532098,1532316,1534102,1534149,1534158,1534713,1534737,1534860,1535115,1535161,1535532,1535610,1535676,1536350,1536383,1536464,1536488,1536537,1536914,1536931,1537018,1537147,1537190,1537193,1537221,1537263,1537360,1537415,1537555,1537700,1538516-1538517,1538519,1538574,1538581,1538812,1538925,1538928,1538939,1540044,1540417,1540752,1541432,1541635,1541638,1541705,1541790,1542042,1542069,1542071,1542119,1542129,1542138,154
2146,1542151,1542610,1542765,1542767,1542774,1543145,1543187,1543413,1543594,1543961,1544295,1544302-1544303,1544316,1544597,1544600,1544688,1544690,1544878,1544895,1545111,1545122,1545302,1545835,1545845,1547252,1547454,1547774,1547866,1547873,1548097,1548105,1548170,1548486,1548673,1549858,1549874,1550691,1550772,1550803,1551524,1551579,1552957-1552958,1553101,1553105,1553113,1553376-1553377,1553501,1553556,1554978,1555403,1555499,1557320,1557522,1559009,1559197,1560690,1560701,1561426,1561703,1563110,1564292,1564576,1564966,1564969,1565085,1565531,1566503-1566504,1567064,1567109,1567134,1567204,1567228,1567286,1567392,1567492,1567494,1567740,1567752,1567985,1568070,1568180,1568349,1568361,1568872,1568953,1568955,1569069,1570642,1571214,1571747,1571787,1571795,1572102,1572200,1572340,1573088,1573106,1573209,1574868,1575270,1575284,1575525,1575915,1577151,1577200,1577294,1577739,1577755,1577812-1577813,1578273,1578311,1578326,1578670,1578820,1578853,1578875,1579274,1579429,1579588,
1579684,1580626,1580650,1580832,1580867,1580872,1581296,1581305,1581315,1581430,1581810,1583580,1583977,1584342,1584576,1584592,1584745,1585686,1586052,1586255,1586352,1586467,1587511,1587946,1587968,1588772,1588778,1589184,1589188,1589360,1589460,1589486,1590212,1591123,1592014,1592034,1593992,1594156,1594223,1594794,1594814,1594834,1595061,1595431,1596866,1600311,1600315,1600323,1600331,1600348,1600368,1600393,1600563,1600781,1600909,1601851,1606009,1611379-1611381,1612225,1612405,1615211,1615219,1615255-1615256,1615260,1615263,1615354,1616131,1617687,1619071,1619105,1619118,1619153,1619774,1619802,1620332,1621978,1621981,1625533,1625537,1628431,1628536,1628540,1633126,1636874,1637826,1640730,1640862,1640873,1641564,1643033,1643074,1643409,1643437,1643457,1643461,1643482,1643793,1643810,1643972-1643973,1647339,1650481,1650489,1650834,1653039,1655712,1655738
Modified: subversion/branches/1.8.x-r1643074/autogen.sh
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1643074/autogen.sh?rev=1659622&r1=1659621&r2=1659622&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1643074/autogen.sh (original)
+++ subversion/branches/1.8.x-r1643074/autogen.sh Fri Feb 13 17:36:25 2015
@@ -23,6 +23,10 @@
### Run this to produce everything needed for configuration. ###
+# Some shells can produce output when running 'cd' which interferes
+# with the construct 'abs=`cd dir && pwd`'.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
# Run tests to ensure that our build requirements are met
RELEASE_MODE=""
RELEASE_ARGS=""
@@ -71,48 +75,80 @@ rm -f build/config.guess build/config.su
$libtoolize --copy --automake --force
ltpath="`dirname $libtoolize`"
-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`}/libtool.m4
-if [ ! -f $ltfile ]; then
- echo "$ltfile not found (try setting the LIBTOOL_M4 environment variable)"
+if [ "x$LIBTOOL_M4" = "x" ]; then
+ ltm4_error='(try setting the LIBTOOL_M4 environment variable)'
+ if [ -d "$ltpath/../share/aclocal/." ]; then
+ ltm4=`cd "$ltpath/../share/aclocal" && pwd`
+ else
+ echo "Libtool helper path not found $ltm4_error"
+ echo " expected at: '$ltpath/../share/aclocal'"
+ exit 1
+ fi
+else
+ ltm4_error="(the LIBTOOL_M4 environment variable is: $LIBTOOL_M4)"
+ ltm4="$LIBTOOL_M4"
+fi
+
+ltfile="$ltm4/libtool.m4"
+if [ ! -f "$ltfile" ]; then
+ echo "$ltfile not found $ltm4_error"
exit 1
fi
-echo "Copying libtool helper: $ltfile"
+echo "Copying libtool helper: $ltfile"
# An ancient helper might already be present from previous builds,
# and it might be write-protected (e.g. mode 444, seen on FreeBSD).
# This would cause cp to fail and print an error message, but leave
# behind a potentially outdated libtool helper. So, remove before
# copying:
rm -f build/libtool.m4
-cp $ltfile build/libtool.m4
+cp "$ltfile" build/libtool.m4
for file in ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4; do
rm -f build/$file
if [ $lt_major_version -ge 2 ]; then
- ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`}/$file
+ ltfile="$ltm4/$file"
- if [ ! -f $ltfile ]; then
- echo "$ltfile not found (try setting the LIBTOOL_M4 environment
variable)"
+ if [ ! -f "$ltfile" ]; then
+ echo "$ltfile not found $ltm4_error"
exit 1
fi
- echo "Copying libtool helper: $ltfile"
- cp $ltfile build/$file
+ echo "Copying libtool helper: $ltfile"
+ cp "$ltfile" "build/$file"
fi
done
if [ $lt_major_version -ge 2 ]; then
+ if [ "x$LIBTOOL_CONFIG" = "x" ]; then
+ ltconfig_error='(try setting the LIBTOOL_CONFIG environment variable)'
+ if [ -d "$ltpath/../share/libtool/config/." ]; then
+ ltconfig=`cd "$ltpath/../share/libtool/config" && pwd`
+ elif [ -d "$ltpath/../share/libtool/build-aux/." ]; then
+ ltconfig=`cd "$ltpath/../share/libtool/build-aux" && pwd`
+ else
+ echo "Autoconf helper path not found $ltconfig_error"
+ echo " expected at: '$ltpath/../share/libtool/config'"
+ echo " or: '$ltpath/../share/libtool/build-aux'"
+ exit 1
+ fi
+ else
+ ltconfig_error="(the LIBTOOL_CONFIG environment variable is:
$LIBTOOL_CONFIG)"
+ ltconfig="$LIBTOOL_CONFIG"
+ fi
+
for file in config.guess config.sub; do
- configfile=${LIBTOOL_CONFIG-`cd $ltpath/../share/libtool/config ;
pwd`}/$file
+ configfile="$ltconfig/$file"
- if [ ! -f $configfile ]; then
- echo "$configfile not found (try setting the LIBTOOL_CONFIG
environment variable)"
+ if [ ! -f "$configfile" ]; then
+ echo "$configfile not found $ltconfig_error"
exit 1
fi
- cp $configfile build/$file
+ echo "Copying autoconf helper: $configfile"
+ cp "$configfile" build/$file
done
fi
Modified: subversion/branches/1.8.x-r1643074/get-deps.sh
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1643074/get-deps.sh?rev=1659622&r1=1659621&r2=1659622&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1643074/get-deps.sh (original)
+++ subversion/branches/1.8.x-r1643074/get-deps.sh Fri Feb 13 17:36:25 2015
@@ -33,7 +33,7 @@
APR_VERSION=${APR_VERSION:-"1.4.6"}
APU_VERSION=${APU_VERSION:-"1.5.1"}
-SERF_VERSION=${SERF_VERSION:-"1.3.4"}
+SERF_VERSION=${SERF_VERSION:-"1.3.8"}
ZLIB_VERSION=${ZLIB_VERSION:-"1.2.8"}
SQLITE_VERSION=${SQLITE_VERSION:-"3.7.15.1"}
GTEST_VERSION=${GTEST_VERSION:-"1.6.0"}
Propchange: subversion/branches/1.8.x-r1643074/subversion/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Feb 13 17:36:25 2015
@@ -0,0 +1,130 @@
+/subversion/branches/1.5.x-r30215/subversion:870312
+/subversion/branches/1.7.x-fs-verify/subversion:1146708,1161180
+/subversion/branches/1.8.x/subversion:1643117-1659621
+/subversion/branches/1.8.x-VS2013-14/subversion:1603404-1615199
+/subversion/branches/1.8.x-apr-0.9/subversion:1585493-1589570
+/subversion/branches/1.8.x-busted-proxy/subversion:1499222-1502434
+/subversion/branches/1.8.x-gpg-agent/subversion:1600789-1640662
+/subversion/branches/1.8.x-issue4400/subversion:1507591-1512557
+/subversion/branches/1.8.x-issue4437/subversion:1567249-1591140
+/subversion/branches/1.8.x-issue4448/subversion:1540420-1541802
+/subversion/branches/1.8.x-issue4480/subversion:1588773-1591136
+/subversion/branches/1.8.x-javahl-exception-crash/subversion:1586424-1588151
+/subversion/branches/1.8.x-libsvnjavahl-version/subversion:1483910-1485054
+/subversion/branches/1.8.x-openssl-dirs/subversion:1535137-1540436
+/subversion/branches/1.8.x-r1477876/subversion:1477981-1487716
+/subversion/branches/1.8.x-r1481625/subversion:1481637-1482135
+/subversion/branches/1.8.x-r1495063/subversion:1495804-1501074
+/subversion/branches/1.8.x-r1497310-partial/subversion:1497500-1501063
+/subversion/branches/1.8.x-r1502267/subversion:1502268-1515998
+/subversion/branches/1.8.x-r1507044/subversion:1507282-1511571
+/subversion/branches/1.8.x-r1513879/subversion:1514699-1516021
+/subversion/branches/1.8.x-r1536931/subversion:1536934-1591145
+/subversion/branches/1.8.x-r1537147/subversion:1537201-1537216
+/subversion/branches/1.8.x-r1537193/subversion:1537217-1541815
+/subversion/branches/1.8.x-r1541790/subversion:1541791-1542075
+/subversion/branches/1.8.x-r1544597/subversion:1564547-1591149
+/subversion/branches/1.8.x-r1554978/subversion:1555500-1565076
+/subversion/branches/1.8.x-r1561426/subversion:1561547-1640480
+/subversion/branches/1.8.x-r1564215/subversion:1564281-1564620
+/subversion/branches/1.8.x-r1567286/subversion:1567364-1567731
+/subversion/branches/1.8.x-r1567985/subversion:1568016-1568055
+/subversion/branches/1.8.x-r1574868/subversion:1575329-1579873
+/subversion/branches/1.8.x-r1577151/subversion:1589064-1589574
+/subversion/branches/1.8.x-r1577812/subversion:1577814-1588145
+/subversion/branches/1.8.x-r1578311/subversion:1578312-1589576
+/subversion/branches/1.8.x-r1578853/subversion:1578879-1581682
+/subversion/branches/1.8.x-r1579588/subversion:1579589-1591112
+/subversion/branches/1.8.x-r1580626/subversion:1580631,1580652,1580661,1581435,1588382-1591134
+/subversion/branches/1.8.x-r1581305/subversion:1581320-1582587
+/subversion/branches/1.8.x-r1584342/subversion:1584350-1589572
+/subversion/branches/1.8.x-r1589360/subversion:1604732-1640658
+/subversion/branches/1.8.x-r1594223/subversion:1594224-1606975
+/subversion/branches/1.8.x-r1611379/subversion:1612525-1640664
+/subversion/branches/1.8.x-r1611380/subversion:1647889-1657742
+/subversion/branches/1.8.x-r1619774/subversion:1626728-1640478
+/subversion/branches/1.8.x-r1621978/subversion:1622021-1640850
+/subversion/branches/1.8.x-r1625533/subversion:1640743-1642632
+/subversion/branches/1.8.x-r1633126/subversion:1633130-1642634
+/subversion/branches/1.8.x-r1641564/subversion:1641570-1642636
+/subversion/branches/1.8.x-r175-daemonize/subversion:1515866-1516020
+/subversion/branches/1.8.x-rm-external-dir/subversion:1600632-1615197
+/subversion/branches/1.8.x-serf-1.3+-windows/subversion:1517122-1533873
+/subversion/branches/1.8.x-serf-no-lock-support/subversion:1584583-1591109
+/subversion/branches/1.8.x-svn_fs_info-removal/subversion:1467420-1468159
+/subversion/branches/1.8.x-svnsync-serf-memory/subversion:1515248-1515701
+/subversion/branches/1.8.x-synvsync-serf-memory/subversion:1515247
+/subversion/branches/1.8.x-tristate-chunked-request/subversion:1502435-1503894
+/subversion/branches/10Gb/subversion:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
+/subversion/branches/atomic-revprop/subversion:965046-1000689
+/subversion/branches/auto-props-sdc/subversion:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/subversion:872050-872529
+/subversion/branches/diff-callbacks3/subversion:870059-870761
+/subversion/branches/diff-optimizations/subversion:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/subversion:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/subversion:870728-871118
+/subversion/branches/double-delete/subversion:870511-872970
+/subversion/branches/ev2-export/subversion:1325914,1332738,1413107
+/subversion/branches/explore-wc/subversion:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals/subversion:871779-873302
+/subversion/branches/fs-rep-sharing/subversion:869036-873803
+/subversion/branches/fsfs-pack/subversion:873717-874575
+/subversion/branches/gnome-keyring/subversion:870558-871410
+/subversion/branches/gpg-agent-password-store/subversion:1005036-1150766
+/subversion/branches/http-protocol-v2/subversion:874395-876041
+/subversion/branches/in-memory-cache/subversion:869829-871452
+/subversion/branches/in-repo-authz/subversion:1414342-1424779
+/subversion/branches/inheritable-props/subversion:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/subversion:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/subversion:998649-998852
+/subversion/branches/integrate-compression-level/subversion:1068651-1072287
+/subversion/branches/integrate-io-improvements/subversion:1068684-1072297
+/subversion/branches/integrate-is-cachable/subversion:1072568-1074082
+/subversion/branches/integrate-partial-getter/subversion:1072558-1076552
+/subversion/branches/integrate-readline-speedup/subversion:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/subversion:1068695-1072516
+/subversion/branches/integrate-string-improvements/subversion:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/subversion:1072541-1078213
+/subversion/branches/issue-2779-dev/subversion:965496-984198
+/subversion/branches/issue-2843-dev/subversion:871432-874179
+/subversion/branches/issue-3000/subversion:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/subversion:873375-874084
+/subversion/branches/issue-3148-dev/subversion:875193-875204
+/subversion/branches/issue-3220-dev/subversion:872210-872226
+/subversion/branches/issue-3242-dev/subversion:879653-896436
+/subversion/branches/issue-3334-dirs/subversion:875156-875867
+/subversion/branches/issue-3975/subversion:1152931-1160746
+/subversion/branches/issue-4116-dev/subversion:1424719-1425040
+/subversion/branches/issue-4194-dev/subversion:1410507-1414880
+/subversion/branches/javahl-ra/subversion:1342682,1344977
+/subversion/branches/kwallet/subversion:870785-871314
+/subversion/branches/log-g-performance/subversion:870941-871032
+/subversion/branches/merge-skips-obstructions/subversion:874525-874615
+/subversion/branches/multi-layer-moves/subversion:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/subversion:870276,870376
+/subversion/branches/node_pool/subversion:1304828-1305388
+/subversion/branches/performance/subversion:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985673,985695,985697,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,1029335-1029336,1029339-1029340
,1029342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/py-tests-as-modules/subversion:956579-1033052
+/subversion/branches/ra_serf-digest-authn/subversion:875693-876404
+/subversion/branches/reintegrate-improvements/subversion:873853-874164
+/subversion/branches/revprop-cache/subversion:1298521-1326293
+/subversion/branches/revprop-packing/subversion:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/subtree-mergeinfo/subversion:876734-878766
+/subversion/branches/svn-mergeinfo-enhancements/subversion:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/subversion:918519-934609
+/subversion/branches/svn_mutex/subversion:1141683-1182099
+/subversion/branches/svnpatch-diff/subversion:865738-876477
+/subversion/branches/svnraisetc/subversion:874709-875149
+/subversion/branches/svnserve-logging/subversion:869828-870893
+/subversion/branches/tc-issue-3334/subversion:874697-874773
+/subversion/branches/tc-merge-notify/subversion:874017-874062
+/subversion/branches/tc-resolve/subversion:874191-874239
+/subversion/branches/tc_url_rev/subversion:874351-874483
+/subversion/branches/tree-conflicts/subversion:868291-873154
+/subversion/branches/tree-conflicts-notify/subversion:873926-874008
+/subversion/branches/tristate-chunked-request/subversion:1502401,1502673
+/subversion/branches/tweak-build-take-two/subversion:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/subversion:1060426-1064427
+/subversion/branches/verify-at-commit/subversion:1462039-1462408
+/subversion/branches/wc-collate-path/subversion:1407642
+/subversion/trunk/subversion:1467440,1467450,1467481,1467587,1467597,1467668,1467675,1467803,1467807,1467951,1468109,1468116,1468151,1468347,1468395,1468439,1468487,1468565-1468566,1468980,1469248,1469363,1469478,1469489,1469512-1469513,1469550,1469556,1469645,1469674,1469833,1469862,1469866,1469871,1469994,1470031,1470037,1470221,1470238,1470246,1470248,1470537,1470650,1470738,1470781,1470898,1470904,1470908,1470913,1470936,1470993-1470994,1471028-1471029,1471107,1471153,1471302,1471443,1471490,1471744,1475704,1475724,1475772,1475963,1476092,1476155,1476181,1476193,1476254,1476359,1476366,1476607,1477294,1477359,1477729-1477730,1477876,1477891,1478001,1478220-1478221,1478465,1478617,1478897,1478951,1478987,1478998,1479320-1479321,1479323,1479326,1479329,1479540,1479563,1479605,1479896,1480054,1480077,1480080,1480082,1480119,1480149,1480344,1480412,1480426,1480442,1480616,1480641-1480642,1480664,1480669,1480681,1480723,1480738,1480765,1481010,1481418,1481594,1481596,1481625,1481627-
1481628,1481631-1481632,1481772,1481782,1481800,1481813,1481847,1481944,1481981,1482282,1482327,1482338,1482350,1482354,1482436,1482479,1482524,1482528,1482536,1482554,1482558,1482592,1482724,1482759,1482779,1482829,1482969-1482970,1482973,1483015,1483077,1483101,1483116,1483125,1483391,1483397,1483555,1483557,1483575,1483580,1483781,1483927,1483939,1483947,1483964-1483965,1483968,1483972,1483975,1483977,1483984,1484006,1484016-1484017,1484023,1484755,1485018,1485127,1485350,1485413,1485427,1485447,1485449,1485497,1485501,1485650,1486072,1486457,1486572,1486809,1486915,1486931,1487083,1487094,1488183,1488267,1488294,1488425,1488639,1488693,1488878,1489114,1489116-1489117,1489203,1489339,1489935,1490045,1490326,1490679,1490684,1490721,1491432,1491499,1491707,1491739,1491755-1491756,1491762,1491770,1491816,1491868,1492005,1492020,1492145,1492148,1492152,1492164,1492264,1492295,1493102,1493424,1493475,1493703,1493720,1493951,1494089,1494171,1494223,1494287,1494298,1494318,1494342,14946
57,1494913,1494967,1495063,1495104,1495204,1495209,1495214,1495256,1495329,1495428,1495432,1495446,1495597,1495805,1495850,1495978,1496007,1496110-1496111,1496127,1496132,1496151,1496470,1496938,1496957,1497002,1497318-1497319,1497551,1497614,1497804,1497975,1497980,1498000,1498012,1498136,1498449,1498455-1498456,1498483-1498484,1498486,1498550,1498564,1498851,1498885,1498997,1499034,1499044,1499064,1499095-1499096,1499100,1499403,1499423,1499438,1499447,1499460,1499470,1499483,1499492,1499496,1499498,1499595,1499727,1500074,1500175,1500226,1500680,1500695,1500762,1500799,1500801-1500802,1500904,1500928,1501199,1501207,1501656,1501702,1502097,1502267,1502577,1502777,1502811,1502901,1502909,1502952,1503009-1503010,1503058,1503061,1503211,1503318,1503528,1503884,1504192,1504505,1506040-1506041,1506047,1506058,1506966,1507044,1507382,1507567,1507589,1507889,1507891,1508438,1509186,1509196,1511057,1511272,1511353,1511603,1512067,1512119,1512195,1512300-1512301,1512432,1512471-1512472,15
13119,1513122,1513156,1513463,1513472,1513874,1513879-1513880,1513943,1514295,1514315,1514318,1514356,1514628,1514763,1514785,1514804,1515119,1515141,1515201,1515225,1515237,1515343,1515366,1515516,1515534,1515721,1515992,1515997,1516023-1516024,1516049,1516051-1516053,1516071,1516271,1516429,1516556,1516565,1516567,1516806,1518184,1518942,1519615,1519617,1519733,1519816,1519823,1519955,1520065,1520529,1520532,1520539,1520745,1522892,1523666,1524869,1525902,1526439,1526655,1527103,1527105,1530763,1530768,1530872,1530922,1530967,1531002,1531004,1531014,1531938,1532023,1532098,1532316,1534102,1534149,1534158,1534713,1534737,1534860,1535115,1535161,1535532,1535610,1535676,1536350,1536383,1536464,1536488,1536537,1536914,1536931,1537018,1537147,1537190,1537193,1537221,1537263,1537360,1537415,1537555,1537700,1538516-1538517,1538519,1538574,1538581,1538812,1538925,1538928,1538939,1540044,1540417,1540752,1541432,1541635,1541638,1541705,1541790,1542042,1542069,1542071,1542119,1542129,1542138
,1542146,1542151,1542610,1542765,1542767,1542774,1543145,1543187,1543413,1543594,1543961,1544295,1544302-1544303,1544316,1544597,1544600,1544688,1544690,1544878,1544895,1545111,1545122,1545302,1545835,1545845,1547252,1547454,1547774,1547866,1547873,1548097,1548105,1548170,1548486,1548673,1549858,1549874,1550691,1550772,1550803,1551524,1551579,1552957-1552958,1553101,1553105,1553113,1553376-1553377,1553501,1553556,1554978,1555403,1555499,1557320,1557522,1559009,1559197,1560690,1560701,1561426,1561703,1563110,1564292,1564576,1564966,1564969,1565085,1565531,1566503-1566504,1567064,1567109,1567134,1567204,1567228,1567286,1567392,1567492,1567494,1567740,1567752,1567985,1568070,1568180,1568349,1568361,1568872,1568953,1568955,1569069,1570642,1571214,1571747,1571787,1571795,1572102,1572200,1572340,1573088,1573106,1573209,1574868,1575270,1575284,1575525,1575915,1577151,1577200,1577294,1577739,1577755,1577812-1577813,1578273,1578311,1578326,1578670,1578820,1578853,1578875,1579274,1579429,1579
588,1579684,1580626,1580650,1580832,1580867,1580872,1581296,1581305,1581315,1581430,1581810,1583580,1583977,1584342,1584576,1584592,1584745,1585686,1586052,1586255,1586352,1586467,1587511,1587946,1587968,1588772,1588778,1589184,1589188,1589360,1589460,1589486,1590212,1591123,1592014,1592034,1593992,1594156,1594223,1594794,1594814,1594834,1595061,1595431,1596866,1600311,1600315,1600323,1600331,1600348,1600368,1600393,1600563,1600781,1600909,1601851,1606009,1611379-1611381,1612225,1612405,1615211,1615219,1615255-1615256,1615260,1615263,1615354,1616131,1617687,1619071,1619105,1619118,1619153,1619774,1619802,1620332,1621978,1621981,1625533,1625537,1628431,1628536,1628540,1633126,1636874,1637826,1640730,1640862,1640873,1641564,1643033,1643074,1643409,1643437,1643457,1643461,1643482,1643793,1643810,1643972-1643973,1647339,1650481,1650489,1650834,1653039,1655712,1655738
Modified:
subversion/branches/1.8.x-r1643074/subversion/include/private/svn_io_private.h
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1643074/subversion/include/private/svn_io_private.h?rev=1659622&r1=1659621&r2=1659622&view=diff
==============================================================================
---
subversion/branches/1.8.x-r1643074/subversion/include/private/svn_io_private.h
(original)
+++
subversion/branches/1.8.x-r1643074/subversion/include/private/svn_io_private.h
Fri Feb 13 17:36:25 2015
@@ -64,18 +64,6 @@ svn_io__is_finfo_read_only(svn_boolean_t
apr_pool_t *pool);
-/**
- * Lock file at @a lock_file. If that file does not exist, create an empty
- * file.
- *
- * Lock will be automatically released when @a pool is cleared or destroyed.
- * Use @a pool for memory allocations.
- */
-svn_error_t *
-svn_io__file_lock_autocreate(const char *lock_file,
- apr_pool_t *pool);
-
-
/** Buffer test handler function for a generic stream. @see svn_stream_t
* and svn_stream__is_buffered().
*
Modified: subversion/branches/1.8.x-r1643074/subversion/include/svn_version.h
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1643074/subversion/include/svn_version.h?rev=1659622&r1=1659621&r2=1659622&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1643074/subversion/include/svn_version.h
(original)
+++ subversion/branches/1.8.x-r1643074/subversion/include/svn_version.h Fri Feb
13 17:36:25 2015
@@ -72,7 +72,7 @@ extern "C" {
*
* @since New in 1.1.
*/
-#define SVN_VER_PATCH 11
+#define SVN_VER_PATCH 12
/** @deprecated Provided for backward compatibility with the 1.0 API. */
Modified:
subversion/branches/1.8.x-r1643074/subversion/libsvn_client/externals.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1643074/subversion/libsvn_client/externals.c?rev=1659622&r1=1659621&r2=1659622&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1643074/subversion/libsvn_client/externals.c
(original)
+++ subversion/branches/1.8.x-r1643074/subversion/libsvn_client/externals.c Fri
Feb 13 17:36:25 2015
@@ -146,6 +146,7 @@ relegate_dir_external(svn_wc_context_t *
static svn_error_t *
switch_dir_external(const char *local_abspath,
const char *url,
+ const char *url_from_externals_definition,
const svn_opt_revision_t *peg_revision,
const svn_opt_revision_t *revision,
const char *defining_abspath,
@@ -197,7 +198,16 @@ switch_dir_external(const char *local_ab
SVN_ERR(svn_wc__get_wcroot(&defining_wcroot_abspath, ctx->wc_ctx,
defining_abspath, pool, pool));
if (strcmp(wcroot_abspath, defining_wcroot_abspath) == 0)
- return svn_error_create(SVN_ERR_WC_PATH_UNEXPECTED_STATUS, NULL, NULL);
+ return svn_error_createf(SVN_ERR_WC_PATH_UNEXPECTED_STATUS, NULL,
+ _("The external '%s' defined in %s at '%s' "
+ "cannot be checked out because '%s' is "
+ "already a versioned path."),
+ url_from_externals_definition,
+ SVN_PROP_EXTERNALS,
+ svn_dirent_local_style(defining_abspath,
+ pool),
+ svn_dirent_local_style(local_abspath,
+ pool));
}
/* If path is a directory, try to update/switch to the correct URL
@@ -772,6 +782,7 @@ handle_external_item_change(svn_client_c
{
case svn_node_dir:
SVN_ERR(switch_dir_external(local_abspath, new_loc->url,
+ new_item->url,
&(new_item->peg_revision),
&(new_item->revision),
parent_dir_abspath,
Modified: subversion/branches/1.8.x-r1643074/subversion/libsvn_ra_serf/options.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1643074/subversion/libsvn_ra_serf/options.c?rev=1659622&r1=1659621&r2=1659622&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1643074/subversion/libsvn_ra_serf/options.c
(original)
+++ subversion/branches/1.8.x-r1643074/subversion/libsvn_ra_serf/options.c Fri
Feb 13 17:36:25 2015
@@ -33,6 +33,7 @@
#include "svn_ra.h"
#include "svn_dav.h"
#include "svn_xml.h"
+#include "svn_ctype.h"
#include "../libsvn_ra/ra_loader.h"
#include "svn_private_config.h"
@@ -227,7 +228,9 @@ capabilities_headers_iterator_callback(v
}
/* SVN-specific headers -- if present, server supports HTTP protocol v2 */
- else if (strncmp(key, "SVN", 3) == 0)
+ else if (!svn_ctype_casecmp(key[0], 'S')
+ && !svn_ctype_casecmp(key[1], 'V')
+ && !svn_ctype_casecmp(key[2], 'N'))
{
/* If we've not yet seen any information about supported POST
requests, we'll initialize the list/hash with "create-txn"
Modified:
subversion/branches/1.8.x-r1643074/subversion/libsvn_subr/cache-membuffer.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1643074/subversion/libsvn_subr/cache-membuffer.c?rev=1659622&r1=1659621&r2=1659622&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1643074/subversion/libsvn_subr/cache-membuffer.c
(original)
+++ subversion/branches/1.8.x-r1643074/subversion/libsvn_subr/cache-membuffer.c
Fri Feb 13 17:36:25 2015
@@ -101,6 +101,21 @@
* on their hash key.
*/
+/* APR's read-write lock implementation on Windows is horribly inefficient.
+ * Even with very low contention a runtime overhead of 35% percent has been
+ * measured for 'svn-bench null-export' over ra_serf.
+ *
+ * Use a simple mutex on Windows. Because there is one mutex per segment,
+ * large machines should (and usually can) be configured with large caches
+ * such that read contention is kept low. This is basically the situation
+ * we head before 1.8.
+ */
+#ifdef WIN32
+# define USE_SIMPLE_MUTEX 1
+#else
+# define USE_SIMPLE_MUTEX 0
+#endif
+
/* A 16-way associative cache seems to be a good compromise between
* performance (worst-case lookups) and efficiency-loss due to collisions.
*
@@ -465,11 +480,15 @@ struct svn_membuffer_t
* the cache's creator doesn't feel the cache needs to be
* thread-safe.
*/
+# if USE_SIMPLE_MUTEX
+ svn_mutex__t *lock;
+# else
apr_thread_rwlock_t *lock;
+# endif
/* If set, write access will wait until they get exclusive access.
* Otherwise, they will become no-ops if the segment is currently
- * read-locked.
+ * read-locked. Only used when LOCK is an r/w lock.
*/
svn_boolean_t allow_blocking_writes;
#endif
@@ -489,12 +508,16 @@ static svn_error_t *
read_lock_cache(svn_membuffer_t *cache)
{
#if APR_HAS_THREADS
+# if USE_SIMPLE_MUTEX
+ return svn_mutex__lock(cache->lock);
+# else
if (cache->lock)
{
apr_status_t status = apr_thread_rwlock_rdlock(cache->lock);
if (status)
return svn_error_wrap_apr(status, _("Can't lock cache mutex"));
}
+# endif
#endif
return SVN_NO_ERROR;
}
@@ -505,6 +528,12 @@ static svn_error_t *
write_lock_cache(svn_membuffer_t *cache, svn_boolean_t *success)
{
#if APR_HAS_THREADS
+# if USE_SIMPLE_MUTEX
+
+ return svn_mutex__lock(cache->lock);
+
+# else
+
if (cache->lock)
{
apr_status_t status;
@@ -526,6 +555,8 @@ write_lock_cache(svn_membuffer_t *cache,
return svn_error_wrap_apr(status,
_("Can't write-lock cache mutex"));
}
+
+# endif
#endif
return SVN_NO_ERROR;
}
@@ -537,10 +568,18 @@ static svn_error_t *
force_write_lock_cache(svn_membuffer_t *cache)
{
#if APR_HAS_THREADS
+# if USE_SIMPLE_MUTEX
+
+ return svn_mutex__lock(cache->lock);
+
+# else
+
apr_status_t status = apr_thread_rwlock_wrlock(cache->lock);
if (status)
return svn_error_wrap_apr(status,
_("Can't write-lock cache mutex"));
+
+# endif
#endif
return SVN_NO_ERROR;
}
@@ -552,6 +591,12 @@ static svn_error_t *
unlock_cache(svn_membuffer_t *cache, svn_error_t *err)
{
#if APR_HAS_THREADS
+# if USE_SIMPLE_MUTEX
+
+ return svn_mutex__unlock(cache->lock, err);
+
+# else
+
if (cache->lock)
{
apr_status_t status = apr_thread_rwlock_unlock(cache->lock);
@@ -561,6 +606,8 @@ unlock_cache(svn_membuffer_t *cache, svn
if (status)
return svn_error_wrap_apr(status, _("Can't unlock cache mutex"));
}
+
+# endif
#endif
return err;
}
@@ -1290,6 +1337,12 @@ svn_cache__membuffer_cache_create(svn_me
* the cache's creator doesn't feel the cache needs to be
* thread-safe.
*/
+# if USE_SIMPLE_MUTEX
+
+ SVN_ERR(svn_mutex__init(&c[seg].lock, thread_safe, pool));
+
+# else
+
c[seg].lock = NULL;
if (thread_safe)
{
@@ -1299,6 +1352,8 @@ svn_cache__membuffer_cache_create(svn_me
return svn_error_wrap_apr(status, _("Can't create cache mutex"));
}
+# endif
+
/* Select the behavior of write operations.
*/
c[seg].allow_blocking_writes = allow_blocking_writes;
Modified: subversion/branches/1.8.x-r1643074/subversion/libsvn_subr/io.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1643074/subversion/libsvn_subr/io.c?rev=1659622&r1=1659621&r2=1659622&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1643074/subversion/libsvn_subr/io.c (original)
+++ subversion/branches/1.8.x-r1643074/subversion/libsvn_subr/io.c Fri Feb 13
17:36:25 2015
@@ -2089,35 +2089,6 @@ svn_io_file_lock2(const char *lock_file,
return svn_io_lock_open_file(lockfile_handle, exclusive, nonblocking, pool);
}
-svn_error_t *
-svn_io__file_lock_autocreate(const char *lock_file,
- apr_pool_t *pool)
-{
- svn_error_t *err
- = svn_io_file_lock2(lock_file, TRUE, FALSE, pool);
- if (err && APR_STATUS_IS_ENOENT(err->apr_err))
- {
- /* No lock file? No big deal; these are just empty files anyway.
- Create it and try again. */
- svn_error_clear(err);
-
- /* This file creation is racy.
- We don't care as long as file gets created at all. */
- err = svn_io_file_create(lock_file, "", pool);
- if (err && APR_STATUS_IS_EEXIST(err->apr_err))
- {
- svn_error_clear(err);
- err = NULL;
- }
-
- /* Finally, lock the file - if it exists */
- if (!err)
- err = svn_io_file_lock2(lock_file, TRUE, FALSE, pool);
- }
-
- return svn_error_trace(err);
-}
-
/* Data consistency/coherency operations. */
Modified:
subversion/branches/1.8.x-r1643074/subversion/libsvn_subr/named_atomic.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1643074/subversion/libsvn_subr/named_atomic.c?rev=1659622&r1=1659621&r2=1659622&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1643074/subversion/libsvn_subr/named_atomic.c
(original)
+++ subversion/branches/1.8.x-r1643074/subversion/libsvn_subr/named_atomic.c
Fri Feb 13 17:36:25 2015
@@ -32,7 +32,6 @@
#include "svn_pools.h"
#include "svn_dirent_uri.h"
#include "svn_io.h"
-#include "private/svn_io_private.h"
/* Implementation aspects.
*
@@ -198,8 +197,8 @@ struct shared_data_t
*/
struct mutex_t
{
- /* Inter-process sync. is handled by through a lock file. */
- const char *lock_name;
+ /* Inter-process sync. is handled by through lock file. */
+ apr_file_t *lock_file;
/* Pool to be used with lock / unlock functions */
apr_pool_t *pool;
@@ -276,13 +275,14 @@ static svn_error_t *
lock(struct mutex_t *mutex)
{
svn_error_t *err;
- SVN_ERR(svn_mutex__lock(thread_mutex));
- err = svn_io__file_lock_autocreate(mutex->lock_name, mutex->pool);
- if (err)
- err = svn_mutex__unlock(thread_mutex, err);
+ /* Get lock on the filehandle. */
+ SVN_ERR(svn_mutex__lock(thread_mutex));
+ err = svn_io_lock_open_file(mutex->lock_file, TRUE, FALSE, mutex->pool);
- return svn_error_trace(err);
+ return err
+ ? svn_mutex__unlock(thread_mutex, err)
+ : err;
}
/* Utility that releases the lock previously acquired via lock(). If the
@@ -292,9 +292,36 @@ lock(struct mutex_t *mutex)
static svn_error_t *
unlock(struct mutex_t *mutex, svn_error_t * outer_err)
{
- svn_pool_clear(mutex->pool);
- return svn_mutex__unlock(thread_mutex, outer_err);
+ svn_error_t *unlock_err
+ = svn_io_unlock_open_file(mutex->lock_file, mutex->pool);
+ return svn_mutex__unlock(thread_mutex,
+ svn_error_compose_create(outer_err,
+ unlock_err));
+}
+
+#if APR_HAS_MMAP
+/* The last user to close a particular namespace should also remove the
+ * lock file. Failure to do so, however, does not affect further uses
+ * of the same namespace.
+ */
+static apr_status_t
+delete_lock_file(void *arg)
+{
+ struct mutex_t *mutex = arg;
+ const char *lock_name = NULL;
+
+ /* locks have already been cleaned up. Simply close the file */
+ apr_status_t status = apr_file_close(mutex->lock_file);
+
+ /* Remove the file from disk. This will fail if there ares still other
+ * users of this lock file, i.e. namespace. */
+ apr_file_name_get(&lock_name, mutex->lock_file);
+ if (lock_name)
+ apr_file_remove(lock_name, mutex->pool);
+
+ return status;
}
+#endif /* APR_HAS_MMAP */
/* Validate the ATOMIC parameter, i.e it's address. Correct code will
* never need this but if someone should accidentally to use a NULL or
@@ -384,18 +411,29 @@ svn_atomic_namespace__create(svn_atomic_
*/
svn_atomic_namespace__t *new_ns = apr_pcalloc(result_pool, sizeof(**ns));
- /* construct the name of the system objects that we need
+ /* construct the names of the system objects that we need
*/
shm_name = apr_pstrcat(subpool, name, SHM_NAME_SUFFIX, NULL);
- lock_name = apr_pstrcat(result_pool, name, MUTEX_NAME_SUFFIX, NULL);
+ lock_name = apr_pstrcat(subpool, name, MUTEX_NAME_SUFFIX, NULL);
/* initialize the lock objects
*/
SVN_ERR(svn_atomic__init_once(&mutex_initialized, init_thread_mutex, NULL,
result_pool));
- new_ns->mutex.pool = svn_pool_create(result_pool);
- new_ns->mutex.lock_name = lock_name;
+ new_ns->mutex.pool = result_pool;
+ SVN_ERR(svn_io_file_open(&new_ns->mutex.lock_file, lock_name,
+ APR_READ | APR_WRITE | APR_CREATE,
+ APR_OS_DEFAULT,
+ result_pool));
+
+ /* Make sure the last user of our lock file will actually remove it.
+ * Please note that only the last file handle begin closed will actually
+ * remove the underlying file (see docstring for apr_file_remove).
+ */
+ apr_pool_cleanup_register(result_pool, &new_ns->mutex,
+ delete_lock_file,
+ apr_pool_cleanup_null);
/* Prevent concurrent initialization.
*/
@@ -444,21 +482,17 @@ svn_atomic_namespace__create(svn_atomic_
* with our data file)
*/
if (new_ns->data->count > MAX_ATOMIC_COUNT)
- {
- err = svn_error_create(SVN_ERR_CORRUPTED_ATOMIC_STORAGE, 0,
- _("Number of atomics in namespace is too large."));
- }
- else
- {
- /* Cache the number of existing, complete entries. There can't be
- * incomplete ones from other processes because we hold the mutex.
- * Our process will also not access this information since we are
- * either being called from within svn_atomic__init_once or by
- * svn_atomic_namespace__create for a new object.
- */
- new_ns->min_used = new_ns->data->count;
- *ns = new_ns;
- }
+ return svn_error_create(SVN_ERR_CORRUPTED_ATOMIC_STORAGE, 0,
+ _("Number of atomics in namespace is too large."));
+
+ /* Cache the number of existing, complete entries. There can't be
+ * incomplete ones from other processes because we hold the mutex.
+ * Our process will also not access this information since we are
+ * either being called from within svn_atomic__init_once or by
+ * svn_atomic_namespace__create for a new object.
+ */
+ new_ns->min_used = new_ns->data->count;
+ *ns = new_ns;
}
/* Unlock to allow other processes may access the shared memory as well.
Modified: subversion/branches/1.8.x-r1643074/subversion/libsvn_subr/string.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1643074/subversion/libsvn_subr/string.c?rev=1659622&r1=1659621&r2=1659622&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1643074/subversion/libsvn_subr/string.c
(original)
+++ subversion/branches/1.8.x-r1643074/subversion/libsvn_subr/string.c Fri Feb
13 17:36:25 2015
@@ -619,7 +619,7 @@ svn_stringbuf_insert(svn_stringbuf_t *st
if (bytes + count > str->data && bytes < str->data + str->blocksize)
{
/* special case: BYTES overlaps with this string -> copy the source */
- const char *temp = apr_pstrndup(str->pool, bytes, count);
+ const char *temp = apr_pmemdup(str->pool, bytes, count);
svn_stringbuf_insert(str, pos, temp, count);
}
else
@@ -659,7 +659,7 @@ svn_stringbuf_replace(svn_stringbuf_t *s
if (bytes + new_count > str->data && bytes < str->data + str->blocksize)
{
/* special case: BYTES overlaps with this string -> copy the source */
- const char *temp = apr_pstrndup(str->pool, bytes, new_count);
+ const char *temp = apr_pmemdup(str->pool, bytes, new_count);
svn_stringbuf_replace(str, pos, old_count, temp, new_count);
}
else
Modified:
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/deleted-rev.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/deleted-rev.c?rev=1659622&r1=1659621&r2=1659622&view=diff
==============================================================================
---
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/deleted-rev.c
(original)
+++
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/deleted-rev.c
Fri Feb 13 17:36:25 2015
@@ -56,6 +56,9 @@ dav_svn__get_deleted_rev_report(const da
dav_error *derr = NULL;
/* Sanity check. */
+ if (!resource->info->repos_path)
+ return dav_svn__new_error(resource->pool, HTTP_BAD_REQUEST, 0,
+ "The request does not specify a repository
path");
ns = dav_svn__find_ns(doc->namespaces, SVN_XML_NAMESPACE);
if (ns == -1)
return dav_svn__new_error_tag(resource->pool, HTTP_BAD_REQUEST, 0,
Modified:
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/file-revs.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/file-revs.c?rev=1659622&r1=1659621&r2=1659622&view=diff
==============================================================================
---
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/file-revs.c
(original)
+++
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/file-revs.c
Fri Feb 13 17:36:25 2015
@@ -254,6 +254,9 @@ dav_svn__file_revs_report(const dav_reso
arb.repos = resource->info->repos;
/* Sanity check. */
+ if (!resource->info->repos_path)
+ return dav_svn__new_error(resource->pool, HTTP_BAD_REQUEST, 0,
+ "The request does not specify a repository
path");
ns = dav_svn__find_ns(doc->namespaces, SVN_XML_NAMESPACE);
/* ### This is done on other places, but the document element is
in this namespace, so is this necessary at all? */
Modified:
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/get-location-segments.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/get-location-segments.c?rev=1659622&r1=1659621&r2=1659622&view=diff
==============================================================================
---
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/get-location-segments.c
(original)
+++
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/get-location-segments.c
Fri Feb 13 17:36:25 2015
@@ -123,6 +123,9 @@ dav_svn__get_location_segments_report(co
struct location_segment_baton location_segment_baton;
/* Sanity check. */
+ if (!resource->info->repos_path)
+ return dav_svn__new_error(resource->pool, HTTP_BAD_REQUEST, 0,
+ "The request does not specify a repository
path");
ns = dav_svn__find_ns(doc->namespaces, SVN_XML_NAMESPACE);
if (ns == -1)
{
Modified:
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/get-locations.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/get-locations.c?rev=1659622&r1=1659621&r2=1659622&view=diff
==============================================================================
---
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/get-locations.c
(original)
+++
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/get-locations.c
Fri Feb 13 17:36:25 2015
@@ -106,6 +106,9 @@ dav_svn__get_locations_report(const dav_
sizeof(svn_revnum_t));
/* Sanity check. */
+ if (!resource->info->repos_path)
+ return dav_svn__new_error(resource->pool, HTTP_BAD_REQUEST, 0,
+ "The request does not specify a repository
path");
ns = dav_svn__find_ns(doc->namespaces, SVN_XML_NAMESPACE);
if (ns == -1)
{
Modified:
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/inherited-props.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/inherited-props.c?rev=1659622&r1=1659621&r2=1659622&view=diff
==============================================================================
---
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/inherited-props.c
(original)
+++
subversion/branches/1.8.x-r1643074/subversion/mod_dav_svn/reports/inherited-props.c
Fri Feb 13 17:36:25 2015
@@ -63,6 +63,9 @@ dav_svn__get_inherited_props_report(cons
apr_pool_t *iterpool;
/* Sanity check. */
+ if (!resource->info->repos_path)
+ return dav_svn__new_error(resource->pool, HTTP_BAD_REQUEST, 0,
+ "The request does not specify a repository
path");
ns = dav_svn__find_ns(doc->namespaces, SVN_XML_NAMESPACE);
if (ns == -1)
{
