/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: John Arbash Meinel
  • Date: 2008-09-05 03:11:40 UTC
  • mfrom: (3691 +trunk)
  • mto: (3697.7.4 1.7)
  • mto: This revision was merged to the branch mainline in revision 3748.
  • Revision ID: john@arbash-meinel.com-20080905031140-hj0adlcf30l7i99v
Merge in bzr.dev 3691

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
871
871
            self.tt.final_kind(other_root)
872
872
        except NoSuchFile:
873
873
            return
 
874
        if self.other_tree.inventory.root.file_id in self.this_tree.inventory:
 
875
            # the other tree's root is a non-root in the current tree
 
876
            return
874
877
        self.reparent_children(self.other_tree.inventory.root, self.tt.root)
875
878
        self.tt.cancel_creation(other_root)
876
879
        self.tt.cancel_versioning(other_root)