Skip to content

Commit 4991eb4

Browse files
author
Robin Luckey
committed
OTWO-1277 Replaces erronenous bzr 'pull' with 'revert'
1 parent db8cf0e commit 4991eb4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/scm/adapters/bzr/pull.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def pull(from, &block)
1212
run "rm -rf '#{self.url}'"
1313
run "bzr branch '#{from.url}' '#{self.url}'"
1414
else
15-
run "cd '#{self.url}' && bzr pull && bzr pull --overwrite '#{from.url}'"
15+
run "cd '#{self.url}' && bzr revert && bzr pull --overwrite '#{from.url}'"
1616
end
1717

1818
yield(1,1) if block_given? # Progress bar callback

0 commit comments

Comments
 (0)