← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

Add a NEWS entry and prepare submission.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
127
127
            tree, file_list = builtins.tree_files(file_list)
128
128
            if file_list is None:
129
129
                if action is None:
 
130
                    # FIXME: There is a special case here related to the option
 
131
                    # handling that could be clearer and easier to discover by
 
132
                    # providing an --auto action (bug #344013 and #383396) and
 
133
                    # make it mandatory instead of implicit and active only
 
134
                    # when no file_list is provided -- vila 091229
130
135
                    action = 'auto'
131
136
            else:
132
137
                if action is None:
145
150
                    return 0
146
151
            else:
147
152
                # FIXME: This can never occur but the block above needs some
148
 
                # refactoring so transfer tree.auto_resolve() to
 
153
                # refactoring to transfer tree.auto_resolve() to
149
154
                # conflict.auto(tree) --vila 091242
150
155
                pass
151
156
        else:
339
344
class Conflict(object):
340
345
    """Base class for all types of conflict"""
341
346
 
342
 
    # FIXME: cleanup should take care of that
 
347
    # FIXME: cleanup should take care of that ? -- vila 091229
343
348
    has_files = False
344
349
 
345
350
    def __init__(self, path, file_id=None):