← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

Remerge doesn't clear unrelated conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
207
207
        """Select the conflicts associated with paths in a tree.
208
208
        
209
209
        File-ids are also used for this.
 
210
        :return: a pair of ConflictLists: (not_selected, selected)
210
211
        """
211
212
        path_set = set(paths)
212
213
        ids = {}