~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzr

  • Committer: Robert Collins
  • Date: 2006-09-17 21:03:04 UTC
  • mfrom: (2018 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2019.
  • Revision ID: robertc@robertcollins.net-20060917210304-3a697132f5fb68ac
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
61
61
 
62
62
try:
63
63
    import bzrlib
64
 
    import bzrlib.commands
65
 
    import bzrlib.trace
66
64
except ImportError, e:
67
65
    sys.stderr.write("bzr: ERROR: "
68
66
                     "Couldn't import bzrlib and dependencies.\n"
70
68
                     "\n")
71
69
    raise
72
70
 
 
71
import bzrlib.inspect_for_copy
 
72
bzrlib.inspect_for_copy.import_copy_with_hacked_inspect()
 
73
 
 
74
import bzrlib.commands
 
75
import bzrlib.trace
 
76
 
73
77
if bzrlib.version_info[:3] != (0, 11, 0):
74
78
    sys.stderr.write("bzr: WARNING: bzrlib version doesn't match the bzr program.\n"
75
79
            "This may indicate an installation problem.\n"