/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 bzrlib/memorytree.py

merge bzr.dev r3564

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]