Fixed: Bazaar "[merge]" tags parsing fails (#3445).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2780 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-06-06 10:49:36 +00:00 · 2009-06-06 10:49:36 +00:00 · 6a54a0c94c
parent 9c282842a9
commit 6a54a0c94c
1 changed files with 1 additions and 1 deletions
--- 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