← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: John Arbash Meinel
  • Date: 2011-01-12 21:28:39 UTC
  • mfrom: (5602 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5605.
  • Revision ID: john@arbash-meinel.com-20110112212839-lfzo8o183tw10gnd
Merge bzr.dev 5602 to, yet again, resolve a NEWS/bzr-2.3.txt conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
528
528
        for trans_id in self._removed_id:
529
529
            file_id = self.tree_file_id(trans_id)
530
530
            if file_id is not None:
 
531
                # XXX: This seems like something that should go via a different
 
532
                #      indirection.
531
533
                if self._tree.inventory[file_id].kind == 'directory':
532
534
                    parents.append(trans_id)
533
535
            elif self.tree_kind(trans_id) == 'directory':
3020
3022
            file_id = tt.inactive_file_id(conflict[1])
3021
3023
            # special-case the other tree root (move its children instead)
3022
3024
            if path_tree and file_id in path_tree:
3023
 
                if path_tree.inventory[file_id].parent_id is None:
 
3025
                if path_tree.path2id('') == file_id:
 
3026
                    # This is the root entry, skip it
3024
3027
                    continue
3025
3028
            tt.version_file(file_id, conflict[1])
3026
3029
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))