# HG changeset patch # User Chris Cannam # Date 1504606790 -3600 # Node ID 96bcc0ebd102636beaf121946c49194297e185bc # Parent bc47b68a9487a677b86a90438fbbf6cf282315cc# Parent 90bed4e10cc8e809ac15b8ad4600441ffe5ab9bd Merge from branch deploy diff -r 90bed4e10cc8 -r 96bcc0ebd102 lib/redmine/version.rb --- a/lib/redmine/version.rb Wed Aug 30 17:24:37 2017 +0100 +++ b/lib/redmine/version.rb Tue Sep 05 11:19:50 2017 +0100 @@ -14,17 +14,18 @@ # Retrieves the revision from the working copy def self.revision - if File.directory?(File.join(Rails.root, '.svn')) - begin - path = Redmine::Scm::Adapters::AbstractAdapter.shell_quote(Rails.root.to_s) - if `svn info --xml #{path}` =~ /revision="(\d+)"/ - return $1.to_i - end - rescue + return 0 + # if File.directory?(File.join(Rails.root, '.svn')) + # begin + # path = Redmine::Scm::Adapters::AbstractAdapter.shell_quote(Rails.root.to_s) + # if `svn info --xml #{path}` =~ /revision="(\d+)"/ + # return $1.to_i + # end + # rescue # Could not find the current revision - end - end - nil + # end + # end + # nil end REVISION = self.revision