← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Robert Collins
  • Date: 2006-02-16 11:26:39 UTC
  • mto: (1534.1.24 integration)
  • mto: This revision was merged to the branch mainline in revision 1554.
  • Revision ID: robertc@robertcollins.net-20060216112639-6a6a78dbb33a4cc8
Bugfix upgrades to metadir to set the last-revision correctly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1495
1495
            pass
1496
1496
        # find out whats there
1497
1497
        self.step('Finding branch files')
 
1498
        last_revision = self.bzrdir.open_workingtree().last_revision()
1498
1499
        bzrcontents = self.bzrdir.transport.list_dir('.')
1499
1500
        for name in bzrcontents:
1500
1501
            if name.startswith('basis-inventory.'):
1535
1536
                          ('stat-cache', False)]
1536
1537
        for entry in checkout_files:
1537
1538
            self.move_entry('checkout', entry)
 
1539
        if last_revision is not None:
 
1540
            self.bzrdir._control_files.put_utf8('checkout/last-revision',
 
1541
                                                last_revision)
1538
1542
        self.bzrdir._control_files.put_utf8('branch-format', BzrDirMetaFormat1().get_format_string())
1539
1543
        return BzrDir.open(self.bzrdir.root_transport.base)
1540
1544