← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: John Arbash Meinel
  • Date: 2006-11-10 21:06:11 UTC
  • mto: This revision was merged to the branch mainline in revision 2159.
  • Revision ID: john@arbash-meinel.com-20061110210611-ee346404477ecb86
Fix imports to ensure modules are loaded before they are used

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
38
38
                           BinaryFile,
39
39
                           )
40
40
from bzrlib.merge3 import Merge3
41
 
import bzrlib.osutils
42
41
from bzrlib.osutils import rename, pathjoin
43
42
from progress import DummyProgress, ProgressPhase
44
43
from bzrlib.revision import common_ancestor, is_ancestor, NULL_REVISION
224
223
        mutter("doing merge() with no base_revision specified")
225
224
        if base_revision == [None, None]:
226
225
            try:
227
 
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
226
                pb = ui.ui_factory.nested_progress_bar()
228
227
                try:
229
228
                    this_repo = self.this_branch.repository
230
229
                    self.base_rev_id = common_ancestor(self.this_basis, 
327
326
            else:
328
327
                parent = by_path[os.path.dirname(path)]
329
328
            abspath = pathjoin(self.this_tree.basedir, path)
330
 
            kind = bzrlib.osutils.file_kind(abspath)
 
329
            kind = osutils.file_kind(abspath)
331
330
            if file_id in self.base_tree.inventory:
332
331
                executable = getattr(self.base_tree.inventory[file_id], 'executable', False)
333
332
            else: