~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/bzrdir.py

Committer: abentley
Date: 2006-04-19 05:17:20 UTC
mfrom: (1669 +trunk)
mto: (1731.2.9 nested-trees) (2234.6.1 bzr.0.14) (2229.2.4 reserved-ids) (2323.6.9 0.15-integration) (1551.19.24 Aaron's mergeable stuff)
mto: This revision was merged to the branch mainline in revision 1711.
Revision ID: abentley@lappy-20060419051720-a0df814c328384a7

Merge from dev

added added

removed removed

1625

pass

1626

# find out whats there

1627

self.step('Finding branch files')

1628

last_revision = self.bzrdir.open_workingtree().last_revision()

1628

last_revision = self.bzrdir.open_branch().last_revision()

1629

bzrcontents = self.bzrdir.transport.list_dir('.')

1630

for name in bzrcontents:

1631

if name.startswith('basis-inventory.'):