ruby-changes:34111
From: nagachika <ko1@a...>
Date: Wed, 28 May 2014 01:05:23 +0900 (JST)
Subject: [ruby-changes:34111] nagachika:r46192 (ruby_2_1): merge revision(s) r45604: [Backport #9748]
nagachika 2014-05-28 01:05:13 +0900 (Wed, 28 May 2014) New Revision: 46192 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=46192 Log: merge revision(s) r45604: [Backport #9748] * lib/fileutils.rb (FileUtils#copy_entry): update rdoc about preserve option and permissions, following r31123. [ruby-core:62065] [Bug #9748] Modified directories: branches/ruby_2_1/ Modified files: branches/ruby_2_1/ChangeLog branches/ruby_2_1/lib/fileutils.rb branches/ruby_2_1/version.h Index: ruby_2_1/ChangeLog =================================================================== --- ruby_2_1/ChangeLog (revision 46191) +++ ruby_2_1/ChangeLog (revision 46192) @@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1 +Wed May 28 01:05:06 2014 Nobuyoshi Nakada <nobu@r...> + + * lib/fileutils.rb (FileUtils#copy_entry): update rdoc about + preserve option and permissions, following r31123. + [ruby-core:62065] [Bug #9748] + Wed May 28 00:57:06 2014 Nobuyoshi Nakada <nobu@r...> * proc.c (umethod_bind): use the ancestor iclass instead of new Index: ruby_2_1/lib/fileutils.rb =================================================================== --- ruby_2_1/lib/fileutils.rb (revision 46191) +++ ruby_2_1/lib/fileutils.rb (revision 46192) @@ -455,8 +455,8 @@ module FileUtils https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/fileutils.rb#L455 # Both of +src+ and +dest+ must be a path name. # +src+ must exist, +dest+ must not exist. # - # If +preserve+ is true, this method preserves owner, group, permissions - # and modified time. + # If +preserve+ is true, this method preserves owner, group, and + # modified time. Permissions are copied regardless +preserve+. # # If +dereference_root+ is true, this method dereference tree root. # Index: ruby_2_1/version.h =================================================================== --- ruby_2_1/version.h (revision 46191) +++ ruby_2_1/version.h (revision 46192) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1 #define RUBY_VERSION "2.1.2" #define RUBY_RELEASE_DATE "2014-05-28" -#define RUBY_PATCHLEVEL 111 +#define RUBY_PATCHLEVEL 112 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 5 Property changes on: ruby_2_1 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r45604 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/