Fixed: Bazaar "[merge]" tags parsing fails (#3445).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2780 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
9c282842a9
commit
6a54a0c94c
|
@ -89,7 +89,7 @@ module Redmine
|
||||||
else
|
else
|
||||||
next unless revision
|
next unless revision
|
||||||
|
|
||||||
if line =~ /^revno: (\d+)$/
|
if line =~ /^revno: (\d+)($|\s\[merge\]$)/
|
||||||
revision.identifier = $1.to_i
|
revision.identifier = $1.to_i
|
||||||
elsif line =~ /^committer: (.+)$/
|
elsif line =~ /^committer: (.+)$/
|
||||||
revision.author = $1.strip
|
revision.author = $1.strip
|
||||||
|
|
Loading…
Reference in New Issue