Index: subversion/bindings/swig/ruby/svn/fs.rb =================================================================== --- subversion/bindings/swig/ruby/svn/fs.rb (revision 25251) +++ subversion/bindings/swig/ruby/svn/fs.rb (working copy) @@ -498,12 +498,14 @@ def merge_info(paths, include_parents=true) paths = [paths] unless paths.is_a?(Array) - Fs.get_merge_info(self, paths, include_parents) + Fs.get_mergeinfo(self, paths, include_parents) end + alias_method :mergeinfo, :merge_info def change_merge_info(path, info) - Fs.change_merge_info(self, path, info) + Fs.change_mergeinfo(self, path, info) end + alias_method :change_mergeinfo, :change_merge_info end History = SWIG::TYPE_p_svn_fs_history_t Index: subversion/bindings/swig/ruby/svn/ra.rb =================================================================== --- subversion/bindings/swig/ruby/svn/ra.rb (revision 25251) +++ subversion/bindings/swig/ruby/svn/ra.rb (working copy) @@ -247,7 +247,7 @@ def merge_info(paths, revision=nil, include_parents=true) paths = [paths] unless paths.is_a?(Array) revision ||= Svn::Core::INVALID_REVNUM - info = Ra.get_merge_info(self, paths, revision, include_parents) + info = Ra.get_mergeinfo(self, paths, revision, include_parents) unless info.nil? info.each_key do |key| info[key] = Core::MergeInfo.new(info[key]) @@ -255,6 +255,7 @@ end info end + alias_method :mergeinfo, :merge_info private def props_filter(props) Index: subversion/bindings/swig/ruby/svn/repos.rb =================================================================== --- subversion/bindings/swig/ruby/svn/repos.rb (revision 25251) +++ subversion/bindings/swig/ruby/svn/repos.rb (working copy) @@ -366,11 +366,12 @@ paths = [path] end revision ||= Svn::Core::INVALID_REVNUM - results = Repos.fs_get_merge_info(self, paths, revision, + results = Repos.fs_get_mergeinfo(self, paths, revision, include_parents, authz_read_func) results = results[path] if path results end + alias_method :mergeinfo, :merge_info private def setup_report_baton(baton)