You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2019/01/04 11:38:45 UTC
svn commit: r1850351 - in /subversion/branches/1.10.x: ./ NOTICE
subversion/libsvn_subr/version.c
Author: julianfoad
Date: Fri Jan 4 11:38:45 2019
New Revision: 1850351
URL: http://svn.apache.org/viewvc?rev=1850351&view=rev
Log:
Merge r1850348 (bump the copyright year) onto 1.10.x.
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/NOTICE (contents, props changed)
subversion/branches/1.10.x/subversion/libsvn_subr/version.c (contents, props changed)
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 4 11:38:45 2019
@@ -103,4 +103,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1828613,1829012,1829015,1829241,1829260,1829344,1830083,1830882-1830883,1830885,1830900-1830901,1831110,1831112,1831540,1833465,1833621,1833836,1833842,1833864,1833866,1833895,1833897,1833899,1833901,1835760,1836306,1836762,1836802,1836960,1836963,1836968,1836976,1837037,1837790,1838813,1839662,1839703,1839734,1839739,1840991,1842260,1842262,1842264,184
3888,1844882,1844987,1845204,1845261,1845408,1845555,1845577,1846299,1846403,1846406,1846704,1847181-1847182,1847188,1847264,1847572,1847596
+/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1828613,1829012,1829015,1829241,1829260,1829344,1830083,1830882-1830883,1830885,1830900-1830901,1831110,1831112,1831540,1833465,1833621,1833836,1833842,1833864,1833866,1833895,1833897,1833899,1833901,1835760,1836306,1836762,1836802,1836960,1836963,1836968,1836976,1837037,1837790,1838813,1839662,1839703,1839734,1839739,1840991,1842260,1842262,1842264,184
3888,1844882,1844987,1845204,1845261,1845408,1845555,1845577,1846299,1846403,1846406,1846704,1847181-1847182,1847188,1847264,1847572,1847596,1850348
Modified: subversion/branches/1.10.x/NOTICE
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/NOTICE?rev=1850351&r1=1850350&r2=1850351&view=diff
==============================================================================
--- subversion/branches/1.10.x/NOTICE (original)
+++ subversion/branches/1.10.x/NOTICE Fri Jan 4 11:38:45 2019
@@ -1,5 +1,5 @@
Apache Subversion
-Copyright 2018 The Apache Software Foundation
+Copyright 2019 The Apache Software Foundation
This product includes software developed by many people, and distributed
under Contributor License Agreements to The Apache Software Foundation
Propchange: subversion/branches/1.10.x/NOTICE
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 4 11:38:45 2019
@@ -100,4 +100,4 @@
/subversion/branches/verify-at-commit/NOTICE:1462039-1462408
/subversion/branches/verify-keep-going/NOTICE:1439280-1546110
/subversion/branches/wc-collate-path/NOTICE:1402685-1480384
-/subversion/trunk/NOTICE:1817773-1824012
+/subversion/trunk/NOTICE:1817773-1824012,1850348
Modified: subversion/branches/1.10.x/subversion/libsvn_subr/version.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_subr/version.c?rev=1850351&r1=1850350&r2=1850351&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/libsvn_subr/version.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_subr/version.c Fri Jan 4 11:38:45 2019
@@ -143,7 +143,7 @@ svn_version_extended(svn_boolean_t verbo
info->build_time = __TIME__;
info->build_host = SVN_BUILD_HOST;
info->copyright = apr_pstrdup
- (pool, _("Copyright (C) 2018 The Apache Software Foundation.\n"
+ (pool, _("Copyright (C) 2019 The Apache Software Foundation.\n"
"This software consists of contributions made by many people;\n"
"see the NOTICE file for more information.\n"
"Subversion is open source software, see "
Propchange: subversion/branches/1.10.x/subversion/libsvn_subr/version.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 4 11:38:45 2019
@@ -100,4 +100,4 @@
/subversion/branches/verify-at-commit/subversion/libsvn_subr/version.c:1462039-1462408
/subversion/branches/verify-keep-going/subversion/libsvn_subr/version.c:1439280-1546110
/subversion/branches/wc-collate-path/subversion/libsvn_subr/version.c:1402685-1480384
-/subversion/trunk/subversion/libsvn_subr/version.c:1817773-1824012
+/subversion/trunk/subversion/libsvn_subr/version.c:1817773-1824012,1850348