OSDN Git Service
(root)
/
redminele
/
redmine.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9c28284
)
Fixed: Bazaar "[merge]" tags parsing fails (#3445).
author
Jean-Philippe Lang
<jp_lang@yahoo.fr>
Sat, 6 Jun 2009 10:49:36 +0000
(10:49 +0000)
committer
Jean-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
patch
|
blob
|
history
diff --git
a/lib/redmine/scm/adapters/bazaar_adapter.rb
b/lib/redmine/scm/adapters/bazaar_adapter.rb
index
39afb05
..
4d2c741
100644
(file)
--- 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