/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: John Arbash Meinel
  • Date: 2006-09-22 21:56:28 UTC
  • mfrom: (2033 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2034.
  • Revision ID: john@arbash-meinel.com-20060922215628-276d52589e497eaf
[merge] bzr.dev 2033

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2002
2002
                test_suite_factory = benchmarks.test_suite
2003
2003
                if verbose is None:
2004
2004
                    verbose = True
 
2005
                # TODO: should possibly lock the history file...
2005
2006
                benchfile = open(".perf_history", "at")
2006
2007
            else:
2007
2008
                test_suite_factory = None
2916
2917
# we do need to load at least some information about them to know of 
2917
2918
# aliases.  ideally we would avoid loading the implementation until the
2918
2919
# details were needed.
 
2920
from bzrlib.cmd_version_info import cmd_version_info
2919
2921
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2920
2922
from bzrlib.bundle.commands import cmd_bundle_revisions
2921
2923
from bzrlib.sign_my_commits import cmd_sign_my_commits