← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Merge thread.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
396
396
        # at this point ?
397
397
        try:
398
398
            return self.branch.repository.revision_tree(revision_id)
399
 
        except errors.RevisionNotPresent:
 
399
        except (errors.RevisionNotPresent, errors.NoSuchRevision):
400
400
            # the basis tree *may* be a ghost or a low level error may have
401
401
            # occured. If the revision is present, its a problem, if its not
402
402
            # its a ghost.