← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

Fixed deletion handling

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1329
1329
            except KeyError:
1330
1330
                this_name = other_name = self.tt.final_name(trans_id)
1331
1331
            other_path = fp.get_path(trans_id)
1332
 
            this_parent_path = fp.get_path(self.tt.get_trans_id(this_parent))
1333
 
            this_path = os.path.join(this_parent_path, this_name)
 
1332
            if this_parent is not None:
 
1333
                this_parent_path = \
 
1334
                    fp.get_path(self.tt.get_trans_id(this_parent))
 
1335
                this_path = os.path.join(this_parent_path, this_name)
 
1336
            else:
 
1337
                this_path = "<deleted>"
1334
1338
            file_id = self.tt.final_file_id(trans_id)
1335
1339
            self.cooked_conflicts.append(('path conflict', file_id, this_path, 
1336
1340
                                         other_path))