~bzr-pqm/bzr/bzr.dev

Committer: Martin Pool
Date: 2005-10-11 10:01:30 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-20051011100130-7081e39611f003b7

todo

added added

removed removed

# along with this program; if not, write to the Free Software

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

# TODO: Move this into builtins

# TODO: 'bzr resolve' should accept a directory name and work from that

# point down

# TODO: bzr revert should resolve; even when reverting the whole tree

# or particular directories

import bzrlib.status

from bzrlib.branch import Branch

from bzrlib.errors import BzrCommandError