/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

Light changes learned while starting to understand multiple conflicts on
the same path.

* bzrlib/tests/test_conflicts.py:
(TestResolveUnversionedParent): These tests creates multiple
conflicts...

* bzrlib/help_topics/en/conflicts.txt: 
Let's call a dir a dir not a file in 'Missing parent' doc.

* bzrlib/conflicts.py:
(_resolve_interactive): Clearer error message.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
178
178
            return
179
179
        action = getattr(c, action_name, None)
180
180
        if action is None:
181
 
            raise NotImplementedError(action_name)
 
181
            raise NotImplementedError(c.__class__.__name__ + '.' + action_name)
182
182
        action(tree)
183
183
        # FIXME: We need an API to use that on a single conflict
184
184
        ConflictList([c]).remove_files(tree)
430
430
    def take_theirs(self, tree):
431
431
        tree.remove([self.path], force=True, keep_files=False)
432
432
 
 
433
 
433
434
# FIXME: TextConflict is about a single file-id, there never is a conflict_path
434
435
# attribute so we shouldn't inherit from PathConflict but simply from Conflict
435
436
class TextConflict(PathConflict):