← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2007-03-03 16:23:45 UTC
  • mto: This revision was merged to the branch mainline in revision 2316.
  • Revision ID: aaron.bentley@utoronto.ca-20070303162345-wn7k1x3v51372tjt
Update resolve command to automatically mark conflicts as resolved

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1808
1808
        resolved = _mod_conflicts.ConflictList()
1809
1809
        conflict_re = re.compile('^(<{7}|={7}|>{7})')
1810
1810
        for conflict in self.conflicts():
1811
 
            if conflict.typestring != 'text conflict':
 
1811
            if (conflict.typestring != 'text conflict' or
 
1812
                self.kind(conflict.file_id) != 'file'):
1812
1813
                un_resolved.append(conflict)
1813
1814
                continue
1814
1815
            my_file = open(self.id2abspath(conflict.file_id), 'rb')