/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 workingtree.py

Provide dummy WorkingTree.conflicts() implementation rather than spending a lot of time not finding any conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
188
188
    def revision_tree(self, revid):
189
189
        return self.repository.revision_tree(revid)
190
190
 
 
191
    @needs_read_lock
 
192
    def conflicts(self):
 
193
        # FIXME:
 
194
        return []
 
195
 
191
196
 
192
197
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
193
198