/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-20 15:00:38 UTC
  • mto: This revision was merged to the branch mainline in revision 2028.
  • Revision ID: john@arbash-meinel.com-20060920150038-a5651db2503b9e81
rename version_info => cmd_version_info
avoid conflicting with 'bzrlib.version_info' the variable

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2902
2902
# we do need to load at least some information about them to know of 
2903
2903
# aliases.  ideally we would avoid loading the implementation until the
2904
2904
# details were needed.
 
2905
from bzrlib.cmd_version_info import cmd_version_info
2905
2906
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2906
2907
from bzrlib.bundle.commands import cmd_bundle_revisions
2907
2908
from bzrlib.sign_my_commits import cmd_sign_my_commits
2908
 
from bzrlib.version_info import cmd_version_info
2909
2909
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
2910
2910
        cmd_weave_plan_merge, cmd_weave_merge_text