merge revision(s) 34589:

	* lib/test/unit/assertions.rb (build_message): skip escaped
	  question marks.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34590 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 05ea1385d0..6f48e654c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 14 15:07:23 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb (build_message): skip escaped
+	  question marks.
+
 Mon Feb 13 12:06:29 2012  Loren Segal  <lsegal@soen.ca>
 
 	* io.c (Init_IO): use directive hack to make ARGF documentable
diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb
index 19d88d09c7..695a5ef3ca 100644
--- a/lib/test/unit/assertions.rb
+++ b/lib/test/unit/assertions.rb
@@ -265,7 +265,7 @@ EOT
 
       def build_message(head, template=nil, *arguments) #:nodoc:
         template &&= template.chomp
-        template.gsub(/\?/) { mu_pp(arguments.shift) }
+        template.gsub(/\G((?:[^\\]|\\.)*?)(\\)?\?/) { $1 + ($2 ? "?" : mu_pp(arguments.shift)) }
       end
     end
   end
diff --git a/version.h b/version.h
index 97f5d67299..0573811a4f 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 105
+#define RUBY_PATCHLEVEL 106
 
-#define RUBY_RELEASE_DATE "2012-02-13"
+#define RUBY_RELEASE_DATE "2012-02-14"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 14
 
 #include "ruby/version.h"