← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Aaron Bentley
  • Date: 2008-06-06 13:42:21 UTC
  • mto: This revision was merged to the branch mainline in revision 3483.
  • Revision ID: aaron@aaronbentley.com-20080606134221-54emmgm6eagq1szs
Disable fast-path when conflicts are encountered

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1728
1728
        divert_trans = set(file_trans_id[f] for f in divert)
1729
1729
        resolver = lambda t, c: resolve_checkout(t, c, divert_trans)
1730
1730
        raw_conflicts = resolve_conflicts(tt, pass_func=resolver)
 
1731
        if len(raw_conflicts) > 0:
 
1732
            precomputed_delta = None
1731
1733
        conflicts = cook_conflicts(raw_conflicts, tt)
1732
1734
        for conflict in conflicts:
1733
1735
            warning(conflict)