← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Vincent Ladeuil
  • Date: 2007-06-10 11:07:10 UTC
  • mfrom: (2485.9.2 bzr.connection.sharing)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070610110710-2xi9ditvln347qpj
merge after bzr bind (why did I have to do that ?)

Show diffs side-by-side

added added

removed removed

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