← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2006-02-21 21:06:53 UTC
  • mto: (1558.1.4 Aaron's integration)
  • mto: This revision was merged to the branch mainline in revision 1565.
  • Revision ID: abentley@panoramicfeedback.com-20060221210653-861c4a970e0d3460
Fixed use of ui_factory (which can't be imported directly)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
90
90
from bzrlib.transform import build_tree
91
91
from bzrlib.transport import get_transport
92
92
from bzrlib.transport.local import LocalTransport
93
 
from bzrlib.ui import ui_factory
 
93
import bzrlib.ui
94
94
import bzrlib.xml5
95
95
 
96
96
 
851
851
                merge_inner(self.branch,
852
852
                            self.basis_tree(), 
853
853
                            repository.revision_tree(other_revision),
854
 
                            this_tree=self, pb=ui_factory.progress_bar())
 
854
                            this_tree=self, 
 
855
                            pb=bzrlib.ui.ui_factory.progress_bar())
855
856
                self.set_last_revision(self.branch.last_revision())
856
857
            return count
857
858
        finally: