/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: John Arbash Meinel
  • Date: 2006-08-16 18:38:57 UTC
  • mfrom: (1934 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1937.
  • Revision ID: john@arbash-meinel.com-20060816183857-7307edffa7098bd2
[merge] bzr.dev 1934

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
507
507
                        self.tree_kind(t) == 'directory'])
508
508
        for trans_id in self._removed_id:
509
509
            file_id = self.tree_file_id(trans_id)
510
 
            if self._tree.inventory[file_id].kind in ('directory', 
511
 
                                                      'root_directory'):
 
510
            if self._tree.inventory[file_id].kind == 'directory':
512
511
                parents.append(trans_id)
513
512
 
514
513
        for parent_id in parents:
1071
1070
        contents_mod = True
1072
1071
        meta_mod = False
1073
1072
    if has_contents is True:
1074
 
        real_e_kind = entry.kind
1075
 
        if real_e_kind == 'root_directory':
1076
 
            real_e_kind = 'directory'
1077
 
        if real_e_kind != working_kind:
 
1073
        if entry.kind != working_kind:
1078
1074
            contents_mod, meta_mod = True, False
1079
1075
        else:
1080
1076
            cur_entry._read_tree_state(working_tree.id2path(file_id),