[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ruby-cvs
Subject:    [ruby-cvs:39035] yugui:r31856 (ruby_1_9_2): merges r30629 and r30630 from trunk into ruby_1_9_2.
From:       yugui () ruby-lang ! org
Date:       2011-05-31 3:46:23
Message-ID: 20110531034623.073013ED34 () fluorine ! ruby-lang ! org
[Download RAW message or body]

yugui	2011-05-31 12:46:21 +0900 (Tue, 31 May 2011)

  New Revision: 31856

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

  Log:
    merges r30629 and r30630 from trunk into ruby_1_9_2.
    --
    * ext/psych/lib/psych/visitors/to_ruby.rb: merge keys are actually
      part of YAML 1.1, so they should be supported.  Remove warning and
      merge keys to parent.  [ruby-core:34679]
    * test/psych/test_merge_keys.rb: test for merge keys
    --
    * ext/psych/lib/psych/visitors/to_ruby.rb: fixing merge key support
      when multiple merge keys are specified.
    * test/psych/test_merge_keys.rb: tests for multi-merge key support

  Added files:
    branches/ruby_1_9_2/test/psych/test_merge_keys.rb
  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/psych/lib/psych/visitors/to_ruby.rb
    branches/ruby_1_9_2/version.h

[prev in list] [next in list] [prev in thread] [next in thread]