← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Martin Pool
  • Date: 2006-03-21 12:26:54 UTC
  • mto: This revision was merged to the branch mainline in revision 1621.
  • Revision ID: mbp@sourcefrog.net-20060321122654-514047ed65795a17
New developer commands 'weave-list' and 'weave-join'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2413
2413
# these get imported and then picked up by the scan for cmd_*
2414
2414
# TODO: Some more consistent way to split command definitions across files;
2415
2415
# we do need to load at least some information about them to know of 
2416
 
# aliases.
 
2416
# aliases.  ideally we would avoid loading the implementation until the
 
2417
# details were needed.
2417
2418
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2418
2419
from bzrlib.sign_my_commits import cmd_sign_my_commits
 
2420
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join