← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-06-21 05:22:37 UTC
  • mfrom: (2490.2.33 graphwalker)
  • Revision ID: pqm@pqm.ubuntu.com-20070621052237-2phm1z5dg4arrwnk
Avoid topological sorting in Repository.get_ancestry where possible

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
56
56
 
57
57
    See also bzr resolve.
58
58
    """
59
 
    takes_options = [
60
 
            Option('text',
61
 
                   help='List paths of files with text conflicts.'),
62
 
        ]
 
59
    takes_options = [Option('text', help='list text conflicts by pathname')]
63
60
 
64
61
    def run(self, text=False):
65
62
        from bzrlib.workingtree import WorkingTree
89
86
    """
90
87
    aliases = ['resolved']
91
88
    takes_args = ['file*']
92
 
    takes_options = [
93
 
            Option('all', help='Resolve all conflicts in this tree.'),
94
 
            ]
 
89
    takes_options = [Option('all', help='Resolve all conflicts in this tree')]
95
90
    def run(self, file_list=None, all=False):
96
91
        from bzrlib.workingtree import WorkingTree
97
92
        if all: