← 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: 2009-12-01 10:22:12 UTC
  • mfrom: (4798.7.3 fix-213184)
  • Revision ID: pqm@pqm.ubuntu.com-20091201102212-n4fvh6frief0fltd
Document how to resolve tag conflicts. (Neil Martinsen-Burrell,
        #213184)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
53
53
    instead.  (This is useful for editing all files with text conflicts.)
54
54
 
55
55
    Use bzr resolve when you have fixed a problem.
56
 
 
57
 
    See also bzr resolve.
58
56
    """
59
57
    takes_options = [
60
58
            Option('text',
61
59
                   help='List paths of files with text conflicts.'),
62
60
        ]
 
61
    _see_also = ['resolve']
63
62
 
64
63
    def run(self, text=False):
65
64
        from bzrlib.workingtree import WorkingTree
82
81
    before you should commit.
83
82
 
84
83
    Once you have fixed a problem, use "bzr resolve" to automatically mark
85
 
    text conflicts as fixed, resolve FILE to mark a specific conflict as
 
84
    text conflicts as fixed, "bzr resolve FILE" to mark a specific conflict as
86
85
    resolved, or "bzr resolve --all" to mark all conflicts as resolved.
87
 
 
88
 
    See also bzr conflicts.
89
86
    """
90
87
    aliases = ['resolved']
91
88
    takes_args = ['file*']
92
89
    takes_options = [
93
90
            Option('all', help='Resolve all conflicts in this tree.'),
94
91
            ]
 
92
    _see_also = ['conflicts']
95
93
    def run(self, file_list=None, all=False):
96
94
        from bzrlib.workingtree import WorkingTree
97
95
        if all: