COMMIT Reverted d1b01265d29dc55fbd6b2ae5082736f23c7d2e36.	http://github.com/rubyspec/rubyspec/commit/a599e557aedf78015e2dd1d170968879bf284041
COMMIT library/uri: insure string-like arguments are accepted for URI.join, URI#merge, URI#route_to, URI#route_from.	http://github.com/rubyspec/rubyspec/commit/6d2cbe42a46d689626fe10f0feb8a5334304679f
COMMIT library/uri: Basic specs for URI#merge; check that URI() and URI.join   accept URI objects [redmine:3505]	http://github.com/rubyspec/rubyspec/commit/0cc448295e156259d90b7ad25b478b1e47efd9b4

===================================================================
+++ 20100722T092247
@@ 12 @@
 URL: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8
 リポジトリのルート: http://svn.ruby-lang.org/repos/ruby
 リポジトリ UUID: b2dd03c8-39d4-4d8f-98ff-823fe69b080e
+リビジョン: 28709
 ノード種別: ディレクトリ
 準備中の処理: 特になし
 最終変更者: svn
@@ 31330 @@
 
 /home/chkbuild/tmp/build/ruby-1.8/<buildtime>/rubyspec/library/uri/join_spec.rb
 URI.join
+- returns a URI object of the concatenation of a protocol and domain, and a path
+- raises an error if given no argument
+- doesn't create redundant '/'s
+- discards arguments given before an absolute uri
+- resolves .. in paths
 
 /home/chkbuild/tmp/build/ruby-1.8/<buildtime>/rubyspec/library/uri/mailto/build_spec.rb
 URI::Mailto.build
 - conforms to the MatzRuby tests
 
+/home/chkbuild/tmp/build/ruby-1.8/<buildtime>/rubyspec/library/uri/merge_spec.rb
+URI#merge
+- returns the receiver and the argument, joined as per URI.join
+- accepts URI objects as argument
 
 /home/chkbuild/tmp/build/ruby-1.8/<buildtime>/rubyspec/library/uri/normalize_spec.rb
 URI#normalize
@@ 31378 @@
 URI.regexp
 - behaves according to the MatzRuby tests
 
+/home/chkbuild/tmp/build/ruby-1.8/<buildtime>/rubyspec/library/uri/route_from_spec.rb
+URI#route_from
+- gives the minimal difference between the current URI and the target
 
+/home/chkbuild/tmp/build/ruby-1.8/<buildtime>/rubyspec/library/uri/route_to_spec.rb
+URI#route_to
+- gives the minimal difference between the current URI and the target
 
 /home/chkbuild/tmp/build/ruby-1.8/<buildtime>/rubyspec/library/uri/select_spec.rb
 URI#select
@@ 31400 @@
 /home/chkbuild/tmp/build/ruby-1.8/<buildtime>/rubyspec/library/uri/uri_spec.rb
 the URI method
 - parses a given URI, returning a URI object
+- converts its argument with to_str
 - does not add a URI method to Object instances
 
 /home/chkbuild/tmp/build/ruby-1.8/<buildtime>/rubyspec/library/yaml/add_builtin_type_spec.rb
@@ 36584 @@
 
 Finished in <t> seconds
 
+3220 files, 13621 examples, <num> expectations, 67 failures, 71 errors
 exit 1
 failed(rubyspec)
 == end # <time>

===================================================================
--- 20100721T094428
@@ 12 @@
 URL: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8
 リポジトリのルート: http://svn.ruby-lang.org/repos/ruby
 リポジトリ UUID: b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-リビジョン: 28695
 ノード種別: ディレクトリ
 準備中の処理: 特になし
 最終変更者: svn
@@ 31330 @@
 
 /home/chkbuild/tmp/build/ruby-1.8/<buildtime>/rubyspec/library/uri/join_spec.rb
 URI.join
-- returns a URI object of the concatonation of a protocol and domain, and a path
-- doesn't create redundent '/'s
 
 /home/chkbuild/tmp/build/ruby-1.8/<buildtime>/rubyspec/library/uri/mailto/build_spec.rb
 URI::Mailto.build
@@ 36567 @@
 
 Finished in <t> seconds
 
-3217 files, 13613 examples, <num> expectations, 67 failures, 71 errors
 exit 1
 failed(rubyspec)
 == end # <time>