← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-10 07:46:15 UTC
  • mfrom: (5844 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5845.
  • Revision ID: jelmer@samba.org-20110510074615-eptod049ndjxc4i7
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
33
33
    versionedfile,
34
34
    )
35
35
""")
36
 
import bzrlib
37
36
from bzrlib import (
38
37
    errors,
39
38
    ui,
318
317
                pass
319
318
            else:
320
319
                try:
321
 
                    parent_ids.append(tree.inventory[root_id].revision)
 
320
                    parent_ids.append(tree.get_file_revision(root_id))
322
321
                except errors.NoSuchId:
323
322
                    # not in the tree
324
323
                    pass