← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Andrew Bennetts
  • Date: 2010-02-12 12:22:11 UTC
  • mto: This revision was merged to the branch mainline in revision 5033.
  • Revision ID: andrew.bennetts@canonical.com-20100212122211-ygj7fc8u9btuvpbz
Fix syntax error from bad conflict resolution.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
27
27
    merge3,
28
28
    osutils,
29
29
    patiencediff,
30
 
    progress,
31
30
    revision as _mod_revision,
32
31
    textfile,
33
32
    trace,
770
769
        self._compute_transform()
771
770
        results = self.tt.apply(no_conflicts=True)
772
771
        self.write_modified(results)
 
772
        try:
773
773
            self.this_tree.add_conflicts(self.cooked_conflicts)
774
774
        except errors.UnsupportedOperation:
775
775
            pass