Rev 5849: Forgot that sometimes we don't have any parents during pull. in http://bazaar.launchpad.net/~jameinel/bzr/2.4-pull-iter-changes-780677
John Arbash Meinel
john at arbash-meinel.com
Wed May 11 11:45:57 UTC 2011
At http://bazaar.launchpad.net/~jameinel/bzr/2.4-pull-iter-changes-780677
------------------------------------------------------------
revno: 5849
revision-id: john at arbash-meinel.com-20110511114552-ewvahrx40jsh0pkk
parent: john at arbash-meinel.com-20110510184954-d9av3zsklvnc7ofk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.4-pull-iter-changes-780677
timestamp: Wed 2011-05-11 13:45:52 +0200
message:
Forgot that sometimes we don't have any parents during pull.
-------------- next part --------------
=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py 2011-05-10 18:49:54 +0000
+++ b/bzrlib/workingtree.py 2011-05-11 11:45:52 +0000
@@ -1033,8 +1033,10 @@
if new_revision_info != old_revision_info:
repository = self.branch.repository
if repository._format.fast_deltas:
- basis_id = self.get_parent_ids()[0]
- basis_tree = repository.revision_tree(basis_id)
+ parent_ids = self.get_parent_ids()
+ if parent_ids:
+ basis_id = parent_ids[0]
+ basis_tree = repository.revision_tree(basis_id)
basis_tree.lock_read()
try:
new_basis_tree = self.branch.basis_tree()
More information about the bazaar-commits
mailing list