~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/builtins.py

Committer: Martin Pool
Date: 2005-10-13 07:06:01 UTC
mto: (1185.41.1 bzr.sftp) (1464.1.1) (1534.1.1 integration) (1495.1.4) (1505.1.16 bzr-bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
mto: This revision was merged to the branch mainline in revision 1454.
Revision ID: mbp@sourcefrog.net-20051013070601-8e1e177942d5614d

- move 'conflict' and 'resolved' from shipped plugin to regular builtins

added added

removed removed

1466

annotate_file(b, file_version, file_id, sys.stdout)

1467

finally:

1468

b.unlock()

1469

1470

# these get imported and then picked up by the scan for cmd_*

1471

# TODO: Some more consistent way to split command definitions across files;

1472

# we do need to load at least some information about them to know of

1473

# aliases.

1474

from bzrlib.conflicts import cmd_resolve, cmd_conflicts