← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Aaron Bentley
  • Date: 2006-03-10 06:20:13 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1647.
  • Revision ID: aaron.bentley@utoronto.ca-20060310062013-73726f82ca89344c
Conflict serialization working for WorkingTree3

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
31
31
from bzrlib.option import Option
32
32
from bzrlib.osutils import rename
33
33
from bzrlib.rio import Stanza
34
 
from bzrlib.workingtree import CONFLICT_SUFFIXES, WorkingTree
 
34
 
 
35
 
 
36
CONFLICT_SUFFIXES = ('.THIS', '.BASE', '.OTHER')
 
37
 
35
38
 
36
39
class cmd_conflicts(bzrlib.commands.Command):
37
40
    """List files with conflicts.
49
52
    See also bzr resolve.
50
53
    """
51
54
    def run(self):
 
55
        from bzrlib.workingtree import WorkingTree
52
56
        for path in WorkingTree.open_containing(u'.')[0].iter_conflicts():
53
57
            print path
54
58
 
70
74
    takes_args = ['file*']
71
75
    takes_options = [Option('all', help='Resolve all conflicts in this tree')]
72
76
    def run(self, file_list=None, all=False):
 
77
        from bzrlib.workingtree import WorkingTree
73
78
        if file_list is None:
74
79
            if not all:
75
80
                raise BzrCommandError(