Author: svn-role
Date: Sun Feb 25 04:00:12 2018
New Revision: 1825287
URL: http://svn.apache.org/viewvc?rev=1825287&view=rev
Log:
Merge the r1825024 group from trunk:
* r1825024, r1825266
Fix "can't break line" warning in generated man page.
Justification:
Small documentation fix
Votes:
+1: jamessan, brane
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/bindings/swig/perl/native/Core.pm
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 25 04:00:12 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,1825045,1825215
+/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
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1825287&r1=1825286&r2=1825287&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Sun Feb 25 04:00:12 2018
@@ -20,10 +20,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1825024, r1825266
- Fix "can't break line" warning in generated man page.
- Justification:
- Small documentation fix
- Votes:
- +1: jamessan, brane
Modified:
subversion/branches/1.10.x/subversion/bindings/swig/perl/native/Core.pm
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/bindings/swig/perl/native/Core.pm?rev=1825287&r1=1825286&r2=1825287&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/bindings/swig/perl/native/Core.pm
(original)
+++ subversion/branches/1.10.x/subversion/bindings/swig/perl/native/Core.pm Sun
Feb 25 04:00:12 2018
@@ -613,7 +613,7 @@ The second is if you have $SVN::Error::h
calls you want to croak on when there is an error, but you don't want to write
an explicit error handler. For example:
-my
$result_rev=SVN::Error::croak_on_error($ctx-E<gt>checkout($url,$path,'HEAD',1));
+my $rev = SVN::Error::croak_on_error($ctx-E<gt>checkout($url,$path,'HEAD',1));
If there is no error then croak_on_error will return the arguments passed to it
unchanged.
