← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/weave_fmt/bzrdir.py

resolve conflicts against trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/weave_fmt/bzrdir.py
599
599
                if name in bzrcontents:
600
600
                    self.bzrdir.transport.delete(name)
601
601
        else:
602
 
            from bzrlib.workingtree import WorkingTreeFormat3
 
602
            from bzrlib.workingtree_3 import WorkingTreeFormat3
603
603
            self.step('Upgrading working tree')
604
604
            self.bzrdir.transport.mkdir('checkout', mode=self.dir_mode)
605
605
            self.make_lock('checkout')