← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/memorytree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-06-25 10:36:36 UTC
  • mfrom: (3350.6.12 versionedfiles)
  • Revision ID: pqm@pqm.ubuntu.com-20080625103636-6kxh4e1gmyn82f50
(mbp for robertc) VersionedFiles refactoring

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/memorytree.py
290
290
                raise errors.GhostRevisionUnusableHere(parents_list[0][0])
291
291
            self._parent_ids = [parent_id for parent_id, tree in parents_list]
292
292
            if parents_list[0][1] is None or parents_list[0][1] == 'null:':
293
 
                import pdb; pdb.set_trace()
294
293
                self._basis_tree = self.branch.repository.revision_tree(None)
295
294
            else:
296
295
                self._basis_tree = parents_list[0][1]