usa	2014-05-27 13:58:36 +0900 (Tue, 27 May 2014)

  New Revision: 46158

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=46158

  Log:
    merge revision(s) 45604: [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_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/fileutils.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 46157)
+++ ruby_2_0_0/ChangeLog	(revision 46158)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Tue May 27 13:57:41 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]
+
 Tue May 27 13:42:36 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* proc.c (umethod_bind): use the ancestor iclass instead of new
Index: ruby_2_0_0/lib/fileutils.rb
===================================================================
--- ruby_2_0_0/lib/fileutils.rb	(revision 46157)
+++ ruby_2_0_0/lib/fileutils.rb	(revision 46158)
@@ -449,8 +449,8 @@ module FileUtils https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/fileutils.rb#L449
   # 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_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 46157)
+++ ruby_2_0_0/version.h	(revision 46158)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-05-27"
-#define RUBY_PATCHLEVEL 486
+#define RUBY_PATCHLEVEL 487
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 5

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45604


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/