← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-06-06 04:32:17 UTC
  • mfrom: (1551.16.3 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20070606043217-jlt8hu49sk54tsag
Don't crash on merging renames of deleted files (#110279)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
870
870
            except KeyError:
871
871
                this_name = other_name = self.tt.final_name(trans_id)
872
872
            other_path = fp.get_path(trans_id)
873
 
            if this_parent is not None:
 
873
            if this_parent is not None and this_name is not None:
874
874
                this_parent_path = \
875
875
                    fp.get_path(self.tt.trans_id_file_id(this_parent))
876
876
                this_path = pathjoin(this_parent_path, this_name)