diff options
| author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-03 04:45:08 +0000 |
|---|---|---|
| committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-03 04:45:08 +0000 |
| commit | c38dec6d3b1c775b93289c4f3086a87787d4c959 (patch) | |
| tree | c3ef059ea5a69e9188c4dca7307972969acb5ef9 | |
| parent | f9042329dd48b1c09751a93624ef5eb1e826074e (diff) | |
| download | ruby-c38dec6d3b1c775b93289c4f3086a87787d4c959.tar.gz | |
* tool/merger.rb: allow r0123 style revision number.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34194 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | tool/merger.rb | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Tue Jan 3 13:43:37 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * tool/merger.rb: allow r0123 style revision number. + Tue Jan 3 11:17:55 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * tool/merger.rb (#version_up): version.h date should be Japanese diff --git a/tool/merger.rb b/tool/merger.rb index a521b0ea16..2f9625ce90 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -132,9 +132,9 @@ else revs.each do |rev| case rev - when /\A\d+:\d+\z/ + when /\Ar?\d+:r?\d+\z/ r = ['-r', rev] - when /\A\d+\z/ + when /\Ar?\d+\z/ r = ['-c', rev] when nil then puts "#$0 revision" |