You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2018/09/28 10:57:48 UTC
svn commit: r1842234 - in /subversion/branches/1.11.x: ./ STATUS
subversion/bindings/swig/ruby/svn/util.rb
Author: julianfoad
Date: Fri Sep 28 10:57:48 2018
New Revision: 1842234
URL: http://svn.apache.org/viewvc?rev=1842234&view=rev
Log:
Merge the r1842222 group from trunk:
* r1842222, r1842223
Teach the Ruby bindings not to choke on type names like svn_client__shelf_t.
Justification:
Unbreak the Ruby bindings following the __ patch.
Notes: r1842222 is the main functional change.
Votes:
+1: julianfoad, stsp, brane
Modified:
subversion/branches/1.11.x/ (props changed)
subversion/branches/1.11.x/STATUS
subversion/branches/1.11.x/subversion/bindings/swig/ruby/svn/util.rb
Propchange: subversion/branches/1.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 28 10:57:48 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:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090
+/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223
Modified: subversion/branches/1.11.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1842234&r1=1842233&r2=1842234&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Fri Sep 28 10:57:48 2018
@@ -20,11 +20,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1842222, r1842223
- Teach the Ruby bindings not to choke on type names like svn_client__shelf_t.
- Justification:
- Unbreak the Ruby bindings following the __ patch.
- Notes: r1842222 is the main functional change.
- Votes:
- +1: julianfoad, stsp, brane
Modified: subversion/branches/1.11.x/subversion/bindings/swig/ruby/svn/util.rb
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/subversion/bindings/swig/ruby/svn/util.rb?rev=1842234&r1=1842233&r2=1842234&view=diff
==============================================================================
--- subversion/branches/1.11.x/subversion/bindings/swig/ruby/svn/util.rb (original)
+++ subversion/branches/1.11.x/subversion/bindings/swig/ruby/svn/util.rb Fri Sep 28 10:57:48 2018
@@ -70,6 +70,8 @@ module Svn
target_name = $POSTMATCH
when /^SWIG_SVN_/
target_name = $POSTMATCH
+ when /^Svn_(?:#{target_mod.name.split("::").last.downcase}_)?_(.+)_t$/
+ # ignore private types
when /^Svn_(?:#{target_mod.name.split("::").last.downcase}_)?(.+)_t$/
target_name = to_ruby_class_name($1)
when /^Svn_(?:#{target_mod.name.split("::").last.downcase}_)?/