← 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-11-14 08:20:59 UTC
  • mfrom: (2990 +trunk)
  • mto: (2990.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 2991.
  • Revision ID: v.ladeuil+lp@free.fr-20071114082059-bx03o3laiqfnyleb
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
550
550
                                 self.tt.root)
551
551
        if self.other_tree.inventory.root is None:
552
552
            return
553
 
        other_root_file_id = self.other_tree.inventory.root.file_id
 
553
        other_root_file_id = self.other_tree.get_root_id()
554
554
        other_root = self.tt.trans_id_file_id(other_root_file_id)
555
555
        if other_root == self.tt.root:
556
556
            return