← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

Merge fix for bug #646961 resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
666
666
        if (self._new_name, self._new_parent) == ({}, {}):
667
667
            return conflicts
668
668
        for children in by_parent.itervalues():
669
 
            name_ids = [(self.final_name(t), t) for t in children]
670
 
            if not self._case_sensitive_target:
671
 
                name_ids = [(n.lower(), t) for n, t in name_ids]
 
669
            name_ids = []
 
670
            for child_tid in children:
 
671
                name = self.final_name(child_tid)
 
672
                if name is not None:
 
673
                    # Keep children only if they still exist in the end
 
674
                    if not self._case_sensitive_target:
 
675
                        name = name.lower()
 
676
                    name_ids.append((name, child_tid))
672
677
            name_ids.sort()
673
678
            last_name = None
674
679
            last_trans_id = None