diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-06-06 10:49:36 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-06-06 10:49:36 +0000 |
| commit | 6a54a0c94ccf9565f07d86b037ed284afc72e07a (patch) | |
| tree | 7aed55616acd33606fd253c53d2eb73ac24c2acd /lib/redmine | |
| parent | 9c282842a933e30a40053c72cf5add2ddf2af901 (diff) | |
| download | redmine-6a54a0c94ccf9565f07d86b037ed284afc72e07a.tar.gz redmine-6a54a0c94ccf9565f07d86b037ed284afc72e07a.zip | |
Fixed: Bazaar "[merge]" tags parsing fails (#3445).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2780 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine')
| -rw-r--r-- | lib/redmine/scm/adapters/bazaar_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/scm/adapters/bazaar_adapter.rb b/lib/redmine/scm/adapters/bazaar_adapter.rb index 39afb0565..4d2c74147 100644 --- a/lib/redmine/scm/adapters/bazaar_adapter.rb +++ b/lib/redmine/scm/adapters/bazaar_adapter.rb @@ -89,7 +89,7 @@ module Redmine else next unless revision - if line =~ /^revno: (\d+)$/ + if line =~ /^revno: (\d+)($|\s\[merge\]$)/ revision.identifier = $1.to_i elsif line =~ /^committer: (.+)$/ revision.author = $1.strip |