← Back to branch summary

~bzr-pqm/bzr/bzr.dev

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

Committer: Robert Collins
Date: 2006-08-11 12:06:10 UTC
mfrom: (1908.5.6 combine set_last_revision and set_pending_merges.)
mto: (1908.7.1 deprecate-old-tree-parent-apis) (1852.16.2 Tree.walkdirs)
mto: This revision was merged to the branch mainline in revision 1973.
Revision ID: robertc@robertcollins.net-20060811120610-ae75892349d3f2e4

Update to replaced parent checking api bzrlib/merge.py

files modified:
bzrlib/bzrdir.py

bzrlib/tests/test_bundle.py

bzrlib/tests/workingtree_implementations/test_parents.py

bzrlib/workingtree.py

Show diffs side-by-side

added added

removed removed

bzrlib/bzrdir.py

685

685

# done on this format anyway. So - acceptable wart.

686

686

result = self.open_workingtree()

687

687

if revision_id is not None:

688

result.set_parent_tree_ids([revision_id])

688

result.set_parent_ids([revision_id])

689

689

return result

690

690

691

691

def get_branch_transport(self, branch_format):

Older »