svn commit: r1827748 - in /subversion/branches/1.10.x: ./ subversion/libsvn_client/shelve.c

[julianfoad]

Author: julianfoad
Date: Mon Mar 26 09:15:31 2018
New Revision: 1827748

URL: http://svn.apache.org/viewvc?rev=1827748&view=rev
Log:
Merge r1827562 from trunk:

 * r1827562
   Shelving: fix encoding of non-ASCII shelf names.
   Justification:
     Allows using non-ASCII shelf names (in a non-ASCII locale).
   Notes:
     The file name differs between branch and trunk, so merge like this:
     svn merge -c1827562 ^/subversion/trunk/subversion/libsvn_client/shelf.c 
subversion/libsvn_client/shelve.c
   Votes:
     +1: julianfoad, stefan2, rhuijben

Modified:
    subversion/branches/1.10.x/   (props changed)
    subversion/branches/1.10.x/subversion/libsvn_client/shelve.c

Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 26 09:15:31 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,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1826747,1827105,1827114
+/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,1826747,1827105,1827114,1827562

Modified: subversion/branches/1.10.x/subversion/libsvn_client/shelve.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_client/shelve.c?rev=1827748&r1=1827747&r2=1827748&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/libsvn_client/shelve.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_client/shelve.c Mon Mar 26 
09:15:31 2018
@@ -57,7 +57,7 @@ shelf_name_encode(char **encoded_name_p,
 
   while (*name)
     {
-      apr_snprintf(out_pos, 3, "%02x", *name++);
+      apr_snprintf(out_pos, 3, "%02x", (unsigned char)(*name++));
       out_pos += 2;
     }
   *encoded_name_p = encoded_name;