diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-27 16:05:13 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-27 16:05:13 +0000 |
| commit | 7ebed66e59efe774ebbd890f2a56c8a54498e22f (patch) | |
| tree | 036c5f4ec76cdea5973a1f239d13c7a980d6a34f | |
| parent | 69eab6991a64b6dff4209f96d719680a875b0d89 (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46192 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/fileutils.rb | 4 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Wed May 28 01:05:06 2014 Nobuyoshi Nakada <[email protected]> + + * 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 <[email protected]> * proc.c (umethod_bind): use the ancestor iclass instead of new diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 3b4e30213e..2491a632a9 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -455,8 +455,8 @@ module FileUtils # 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. # @@ -1,6 +1,6 @@ #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 |