ayumin	2012-01-13 15:22:56 +0900 (Fri, 13 Jan 2012)

  New Revision: 34290

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

  Log:
    merge revision(s) 33790:
    
    * time.c (TIME_COPY_GMT): copy vtm.utc_offset and vtm.zone too.
      patch by Tomoyuki Chikanaga.
      [ruby-dev:44827] [Bug #5586]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/ruby/test_time.rb
    branches/ruby_1_9_3/time.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/time.c
===================================================================
--- ruby_1_9_3/time.c	(revision 34289)
+++ ruby_1_9_3/time.c	(revision 34290)
@@ -1820,7 +1820,10 @@
      (tobj)->vtm.utc_offset = (off), \
      (tobj)->vtm.zone = NULL)
 
-#define TIME_COPY_GMT(tobj1, tobj2) ((tobj1)->gmt = (tobj2)->gmt)
+#define TIME_COPY_GMT(tobj1, tobj2) \
+    ((tobj1)->gmt = (tobj2)->gmt, \
+     (tobj1)->vtm.utc_offset = (tobj2)->vtm.utc_offset, \
+     (tobj1)->vtm.zone = (tobj2)->vtm.zone)
 
 static VALUE time_get_tm(VALUE, struct time_object *);
 #define MAKE_TM(time, tobj) \
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34289)
+++ ruby_1_9_3/ChangeLog	(revision 34290)
@@ -1,3 +1,9 @@
+Fri Jan 13 15:22:43 2012  Tanaka Akira  <akr@f...>
+
+	* time.c (TIME_COPY_GMT): copy vtm.utc_offset and vtm.zone too.
+	  patch by Tomoyuki Chikanaga.
+	  [ruby-dev:44827] [Bug #5586]
+
 Thu Jan 12 13:52:13 2012  NARUSE, Yui  <naruse@r...>
 
 	* cont.c (cont_restore_0): prevent optimizing out `sp'. sp is used for
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34289)
+++ ruby_1_9_3/version.h	(revision 34290)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 26
+#define RUBY_PATCHLEVEL 27
 
 #define RUBY_RELEASE_DATE "2012-01-13"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/ruby/test_time.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_time.rb	(revision 34289)
+++ ruby_1_9_3/test/ruby/test_time.rb	(revision 34290)
@@ -277,6 +277,13 @@
     assert_equal(29700, t2.utc_offset, bug)
   end
 
+  def test_marshal_to_s
+    t1 = Time.new(2011,11,8, 0,42,25, 9*3600)
+    t2 = Time.at(Marshal.load(Marshal.dump(t1)))
+    assert_equal("2011-11-08 00:42:25 +0900", t2.to_s,
+      "[ruby-dev:44827] [Bug #5586]")
+  end
+
   # Sat Jan 01 00:00:00 UTC 2000
   T2000 = Time.at(946684800).gmtime
 

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