Author: svn-role
Date: Wed Mar 7 04:00:08 2018
New Revision: 1826064
URL: http://svn.apache.org/viewvc?rev=1826064&view=rev
Log:
Merge r1825721 from trunk:
* r1825721
Convert macOS versions 10.13.x to release name "High Sierra".
Justication:
Cosmetic correctness of 'svn --version --verbose' output.
Votes:
+1: brane, stsp, philip
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_subr/sysinfo.c
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 7 04:00:08 2018
@@ -100,4 +100,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,1825736,1825778
+/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,1825721,1825736,1825778
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1826064&r1=1826063&r2=1826064&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Wed Mar 7 04:00:08 2018
@@ -51,10 +51,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1825721
- Convert macOS versions 10.13.x to release name "High Sierra".
- Justication:
- Cosmetic correctness of 'svn --version --verbose' output.
- Votes:
- +1: brane, stsp, philip
Modified: subversion/branches/1.10.x/subversion/libsvn_subr/sysinfo.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_subr/sysinfo.c?rev=1826064&r1=1826063&r2=1826064&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/libsvn_subr/sysinfo.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_subr/sysinfo.c Wed Mar 7
04:00:08 2018
@@ -1155,6 +1155,7 @@ release_name_from_version(const char *os
case 10: return "Yosemite";
case 11: return "El Capitan";
case 12: return "Sierra";
+ case 13: return "High Sierra";
}
return NULL;
