summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-25 09:55:26 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-25 09:55:26 +0000
commit4c82c953adf6fc11a9d77e79a05dfffe37cbc363 (patch)
tree281af74461b9c0701cd504b224052ea0dba3b14a
parent46556e87f7f89f4e7ef1bd7ea7bedf1e58f35769 (diff)
merges r20966 from trunk into ruby_1_9_1.
* tool/file2lastrev.rb (get_revisions): fix to ignore end of line. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--tool/file2lastrev.rb4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a70149508..615a9b9d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec 24 20:15:50 2008 Koichi Sasada <ko1@atdot.net>
+
+ * tool/file2lastrev.rb (get_revisions): fix to ignore end of line.
+
Wed Dec 24 13:33:38 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (HAVE_LONG_LONG, HAVE_OFF_T): revised for autoconf
diff --git a/tool/file2lastrev.rb b/tool/file2lastrev.rb
index 73cc9997a..01ac1bbce 100644
--- a/tool/file2lastrev.rb
+++ b/tool/file2lastrev.rb
@@ -24,12 +24,12 @@ def get_revisions(path)
`cd "#{SRCDIR}" && git svn info "#{path}"`
end
- if info =~ /^Revision: (\d+)$/
+ if /^Revision: (\d+)/ =~ info
last = $1
else
raise "last revision not found"
end
- if info =~ /^Last Changed Rev: (\d+)$/
+ if /^Last Changed Rev: (\d+)/ =~ info
changed = $1
else
raise "changed revision not found"