← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-04-07 21:11:44 UTC
  • mfrom: (1558.7.13 bzr.spurious-conflict)
  • Revision ID: pqm@pqm.ubuntu.com-20060407211144-0d74356b1cc77c00
Reduced spurious conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
605
605
                if name == last_name:
606
606
                    conflicts.append(('duplicate', last_trans_id, trans_id,
607
607
                    name))
608
 
                last_name = name
609
 
                last_trans_id = trans_id
 
608
                try:
 
609
                    kind = self.final_kind(trans_id)
 
610
                except NoSuchFile:
 
611
                    kind = None
 
612
                file_id = self.final_file_id(trans_id)
 
613
                if kind is not None or file_id is not None:
 
614
                    last_name = name
 
615
                    last_trans_id = trans_id
610
616
        return conflicts
611
617
 
612
618
    def _duplicate_ids(self):
1092
1098
            raw_conflicts = resolve_conflicts(tt, child_pb)
1093
1099
        finally:
1094
1100
            child_pb.finished()
1095
 
        for line in conflicts_strings(cook_conflicts(raw_conflicts, tt)):
 
1101
        conflicts = cook_conflicts(raw_conflicts, tt)
 
1102
        for line in conflicts_strings(conflicts):
1096
1103
            warning(line)
1097
1104
        pp.next_phase()
1098
1105
        tt.apply()
1100
1107
    finally:
1101
1108
        tt.finalize()
1102
1109
        pb.clear()
 
1110
    return conflicts
1103
1111
 
1104
1112
 
1105
1113
def resolve_conflicts(tt, pb=DummyProgress()):