f42e73c33a1daf1c31b85bc80a825cffd652e14b

Author: Robin Luckey

Date: 2009-08-07 10:05:49 -0700

[FIX] BzrAdapter: Support bzr 1.17

diff --git a/lib/scm/adapters/bzr/commits.rb b/lib/scm/adapters/bzr/commits.rb index 1511d75..fb70574 100644 --- a/lib/scm/adapters/bzr/commits.rb +++ b/lib/scm/adapters/bzr/commits.rb @@ -92,7 +92,7 @@ module Scm::Adapters end def rev_list_command(since=nil) - "cd '#{self.url}' && bzr log --long --show-id --forward -r #{to_rev_param(since)}.." + "cd '#{self.url}' && bzr log --long --show-id --forward --include-merges -r #{to_rev_param(since)}.." end end end