archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 09:33:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) r45604: [Backport #9748]

Browse source 
* lib/fileutils.rb (FileUtils#copy_entry): update rdoc about
	  preserve option and permissions, following r31123.
	  [ruby-core:62065] [Bug #9748]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46192 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-05-27 16:05:13 +00:00
parent 69eab6991a
commit 7ebed66e59
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Wed May 28 01:05:06 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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@ruby-lang.org> Wed May 28 00:57:06 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* proc.c (umethod_bind): use the ancestor iclass instead of new * proc.c (umethod_bind): use the ancestor iclass instead of new

4
lib/fileutils.rb
View file

@ -455,8 +455,8 @@ module FileUtils
# Both of +src+ and +dest+ must be a path name. # Both of +src+ and +dest+ must be a path name.
# +src+ must exist, +dest+ must not exist. # +src+ must exist, +dest+ must not exist.
# #
# If +preserve+ is true, this method preserves owner, group, permissions # If +preserve+ is true, this method preserves owner, group, and
# and modified time. # modified time. Permissions are copied regardless +preserve+.
# #
# If +dereference_root+ is true, this method dereference tree root. # If +dereference_root+ is true, this method dereference tree root.
# #

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.2" #define RUBY_VERSION "2.1.2"
#define RUBY_RELEASE_DATE "2014-05-28" #define RUBY_RELEASE_DATE "2014-05-28"
#define RUBY_PATCHLEVEL 111 #define RUBY_PATCHLEVEL 112
#define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 5 #define RUBY_RELEASE_MONTH 5