← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Remerge doesn't clear unrelated conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
390
390
            results = self.tt.apply()
391
391
            self.write_modified(results)
392
392
            try:
393
 
                working_tree.set_conflicts(ConflictList(self.cooked_conflicts))
 
393
                new_conflicts = (self.cooked_conflicts +
 
394
                                 list(working_tree.conflicts()))
 
395
                working_tree.set_conflicts(ConflictList(new_conflicts))
394
396
            except UnsupportedOperation:
395
397
                pass
396
398
        finally: