← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: John Arbash Meinel
  • Date: 2006-11-10 22:23:15 UTC
  • mfrom: (2129 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2131.
  • Revision ID: john@arbash-meinel.com-20061110222315-07f2336970e50698
[merge] bzr.dev 2129

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1870
1870
                if name in bzrcontents:
1871
1871
                    self.bzrdir.transport.delete(name)
1872
1872
        else:
 
1873
            from bzrlib.workingtree import WorkingTreeFormat3
1873
1874
            self.step('Upgrading working tree')
1874
1875
            self.bzrdir.transport.mkdir('checkout', mode=self.dir_mode)
1875
1876
            self.make_lock('checkout')
1876
1877
            self.put_format(
1877
 
                'checkout', bzrlib.workingtree.WorkingTreeFormat3())
 
1878
                'checkout', WorkingTreeFormat3())
1878
1879
            self.bzrdir.transport.delete_multi(
1879
1880
                self.garbage_inventories, self.pb)
1880
1881
            for entry in checkout_files: