← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Martin Pool
  • Date: 2007-06-15 07:01:24 UTC
  • mfrom: (2528 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2530.
  • Revision ID: mbp@sourcefrog.net-20070615070124-clpwqh5gxc4wbf9l
Merge trunk

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)