← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
243
243
            self._new_root = new_roots[0]
244
244
            return
245
245
        old_new_root = new_roots[0]
246
 
        # TODO: What to do if a old_new_root is present, but self._new_root is
247
 
        #       not listed as being removed? This code explicitly unversions
248
 
        #       the old root and versions it with the new file_id. Though that
249
 
        #       seems like an incomplete delta
250
 
 
251
246
        # unversion the new root's directory.
252
 
        file_id = self.final_file_id(old_new_root)
 
247
        if self.final_kind(self._new_root) is None:
 
248
            file_id = self.final_file_id(old_new_root)
 
249
        else:
 
250
            file_id = self.final_file_id(self._new_root)
253
251
        if old_new_root in self._new_id:
254
252
            self.cancel_versioning(old_new_root)
255
253
        else: