← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robert Collins
  • Date: 2008-09-02 05:28:37 UTC
  • mfrom: (3675 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3677.
  • Revision ID: robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
632
632
            self.tt.final_kind(other_root)
633
633
        except NoSuchFile:
634
634
            return
 
635
        if self.other_tree.inventory.root.file_id in self.this_tree.inventory:
 
636
            # the other tree's root is a non-root in the current tree
 
637
            return
635
638
        self.reparent_children(self.other_tree.inventory.root, self.tt.root)
636
639
        self.tt.cancel_creation(other_root)
637
640
        self.tt.cancel_versioning(other_root)