Project

General

Profile

« Previous | Next » 

Revision 31856

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