]> source.dussan.org Git - redmine.git/commitdiff
Fixed: Bazaar "[merge]" tags parsing fails (#3445).
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Sat, 6 Jun 2009 10:49:36 +0000 (10:49 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Sat, 6 Jun 2009 10:49:36 +0000 (10:49 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2780 e93f8b46-1217-0410-a6f0-8f06a7374b81

lib/redmine/scm/adapters/bazaar_adapter.rb

index 39afb0565f9d1cc0a91b559bc19bf56613c81eb3..4d2c741472557dd22d0e31b461da166bcb96cf17 100644 (file)
@@ -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