Author: svn-role
Date: Thu Mar 19 18:23:57 2015
New Revision: 1667836
URL: http://svn.apache.org/r1667836
Log:
Merge r1663791 from trunk:
* r1663791
Trivial typo fix in error message.
Justification:
Fixes a typo.
Votes:
+1: brane, rhuijben, stefan2
Modified:
subversion/branches/1.9.x/ (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/subversion/svn/info-cmd.c
Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 19 18:23:57 2015
@@ -89,4 +89,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663374,1663450,1663697,1663706,1663749,1664078,1664080,1664084-1664085,1664187,1664191,1664200,1664344,1664476,1664480-1664481,1664483,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664927,1665164,1665611-1665612,1665845,1665850,1665852,1665886,1666270,1666272,1666690,1666851
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663374,1663450,1663697,1663706,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664200,1664344,1664476,1664480-1664481,1664483,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664927,1665164,1665611-1665612,1665845,1665850,1665852,1665886,1666270,1666272,1666690,1666851
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1667836&r1=1667835&r2=1667836&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Thu Mar 19 18:23:57 2015
@@ -178,13 +178,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1663791
- Trivial typo fix in error message.
- Justification:
- Fixes a typo.
- Votes:
- +1: brane, rhuijben, stefan2
-
* r1663738
Stop exposing and prohibit changing internal txn props through FS API
Justification:
Modified: subversion/branches/1.9.x/subversion/svn/info-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/svn/info-cmd.c?rev=1667836&r1=1667835&r2=1667836&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/svn/info-cmd.c (original)
+++ subversion/branches/1.9.x/subversion/svn/info-cmd.c Thu Mar 19 18:23:57 2015
@@ -885,7 +885,7 @@ svn_cl__info(apr_getopt_t *os,
if (opt_state->no_newline)
return svn_error_create(
SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- _("--no-newline' is not valid in --xml mode"));
+ _("--no-newline is not valid in --xml mode"));
/* If output is not incremental, output the XML header and wrap
everything in a top-level element. This makes the output in
