← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: John Arbash Meinel
  • Date: 2006-09-23 06:39:46 UTC
  • mfrom: (2034 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2035.
  • Revision ID: john@arbash-meinel.com-20060923063946-e596c8a8eef928b4
[merge] bzr.dev 2034

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2026
2026
                test_suite_factory = benchmarks.test_suite
2027
2027
                if verbose is None:
2028
2028
                    verbose = True
 
2029
                # TODO: should possibly lock the history file...
2029
2030
                benchfile = open(".perf_history", "at")
2030
2031
            else:
2031
2032
                test_suite_factory = None
2940
2941
# we do need to load at least some information about them to know of 
2941
2942
# aliases.  ideally we would avoid loading the implementation until the
2942
2943
# details were needed.
 
2944
from bzrlib.cmd_version_info import cmd_version_info
2943
2945
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2944
2946
from bzrlib.bundle.commands import cmd_bundle_revisions
2945
2947
from bzrlib.sign_my_commits import cmd_sign_my_commits