Rev 2953: simple typo fix. in http://people.ubuntu.com/~robertc/baz2.0/commit-builder
Robert Collins
robertc at robertcollins.net
Sat Oct 27 02:36:15 BST 2007
At http://people.ubuntu.com/~robertc/baz2.0/commit-builder
------------------------------------------------------------
revno: 2953
revision-id:robertc at robertcollins.net-20071027013610-ix7b7c4wls30x6hz
parent: robertc at robertcollins.net-20071027013322-l98rwi4wt9ngf4ld
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit-builder
timestamp: Sat 2007-10-27 11:36:10 +1000
message:
simple typo fix.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py 2007-10-27 01:33:22 +0000
+++ b/bzrlib/repository.py 2007-10-27 01:36:10 +0000
@@ -276,8 +276,8 @@
return None, (ie.revision == self._new_revision_id)
# XXX: Friction: parent_candidates should return a list not a dict
# so that we don't have to walk the inventories again.
- parent_candiate_entries = ie.parent_candidates(parent_invs)
- head_set = self._heads(parent_candiate_entries.keys())
+ parent_candidate_entries = ie.parent_candidates(parent_invs)
+ head_set = self._heads(parent_candidate_entries.keys())
heads = []
for inv in parent_invs:
if ie.file_id in inv:
@@ -298,7 +298,7 @@
store = True
if not store:
# There is a single head, look it up for comparison
- parent_entry = parent_candiate_entries[heads[0]]
+ parent_entry = parent_candidate_entries[heads[0]]
# if the non-content specific data has changed, we'll be writing a
# node:
if (parent_entry.parent_id != ie.parent_id or
More information about the bazaar-commits
mailing list