← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/memorytree.py

  • Committer: Aaron Bentley
  • Date: 2007-07-11 14:58:54 UTC
  • mto: This revision was merged to the branch mainline in revision 2606.
  • Revision ID: abentley@panoramicfeedback.com-20070711145854-06486yosdvexapy1
Got all tests passing with Branch returning 'null:' for null revision

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/memorytree.py
231
231
 
232
232
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
233
233
        """See MutableTree.set_parent_trees()."""
 
234
        for revision_id in revision_ids:
 
235
            _mod_revision.check_not_reserved_id(revision_id)
234
236
        if len(revision_ids) == 0:
235
237
            self._parent_ids = []
236
238
            self._basis_tree = self.branch.repository.revision_tree(None)
250
252
                # a ghost in the left most parent
251
253
                raise errors.GhostRevisionUnusableHere(parents_list[0][0])
252
254
            self._parent_ids = [parent_id for parent_id, tree in parents_list]
253
 
            if parents_list[0][1] is None:
 
255
            if parents_list[0][1] is None or parents_list[0][1] == 'null:':
 
256
                import pdb; pdb.set_trace()
254
257
                self._basis_tree = self.branch.repository.revision_tree(None)
255
258
            else:
256
259
                self._basis_tree = parents_list[0][1]