/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/plugins/fastimport/revision_store.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:06:46 UTC
  • mfrom: (6673 work)
  • mto: This revision was merged to the branch mainline in revision 6675.
  • Revision ID: jelmer@jelmer.uk-20170610000646-xj6jh277lo4xuo10
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/fastimport/revision_store.py
269
269
        # repository.CommitBuilder.record_entry_contents().
270
270
        parent_candidate_entries = ie.parent_candidates(self._rev_parent_invs)
271
271
        head_set = self._commit_builder._heads(ie.file_id,
272
 
            parent_candidate_entries.keys())
 
272
            list(parent_candidate_entries))
273
273
        heads = []
274
274
        for inv in self._rev_parent_invs:
275
275
            if inv.has_id(ie.file_id):