Author: svn-role
Date: Sat Apr 27 04:01:14 2013
New Revision: 1476486
URL: http://svn.apache.org/r1476486
Log:
Merge r1475724 from trunk:
* r1475724
Fix changelist filtering when --changelist values aren't UTF8.
Justification:
User-reported buglet that prevents the use of changelist
filtering altogether for those sorts of changelist names.
Votes:
+1: cmpilato, philip, julianfoad
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/svn/svn.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1475724
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1476486&r1=1476485&r2=1476486&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Sat Apr 27 04:01:14 2013
@@ -134,11 +134,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1475724
- Fix changelist filtering when --changelist values aren't UTF8.
- Justification:
- User-reported buglet that prevents the use of changelist
- filtering altogether for those sorts of changelist names.
- Votes:
- +1: cmpilato, philip, julianfoad
Modified: subversion/branches/1.8.x/subversion/svn/svn.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/svn/svn.c?rev=1476486&r1=1476485&r2=1476486&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/svn/svn.c (original)
+++ subversion/branches/1.8.x/subversion/svn/svn.c Sat Apr 27 04:01:14 2013
@@ -2159,7 +2159,8 @@ sub_main(int argc, const char *argv[], a
opt_state.remove = TRUE;
break;
case opt_changelist:
- opt_state.changelist = apr_pstrdup(pool, opt_arg);
+ SVN_INT_ERR(svn_utf_cstring_to_utf8(&utf8_opt_arg, opt_arg, pool));
+ opt_state.changelist = utf8_opt_arg;
if (opt_state.changelist[0] == '\0')
{
err = svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
