← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
22
22
# TODO: bzr revert should resolve; even when reverting the whole tree
23
23
# or particular directories
24
24
 
 
25
import os
 
26
import errno
 
27
 
25
28
import bzrlib.status
26
29
from bzrlib.branch import Branch
27
30
from bzrlib.errors import BzrCommandError
28
31
from bzrlib.commands import register_command
29
32
from bzrlib.workingtree import CONFLICT_SUFFIXES
30
 
import os
31
 
import errno
32
33
 
33
34
class cmd_conflicts(bzrlib.commands.Command):
34
35
    """List files with conflicts.
39
40
        for path in Branch.open_containing('.').working_tree().iter_conflicts():
40
41
            print path
41
42
 
42
 
register_command(cmd_conflicts)
43
 
 
44
43
class cmd_resolve(bzrlib.commands.Command):
45
44
    """Mark a conflict as resolved.
46
45
    """
72
71
                    print "%s does not exist" % filename
73
72
                else:
74
73
                    print "%s is not conflicted" % filename
75
 
                        
76
 
register_command(cmd_resolve)