/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/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2006-09-27 04:15:52 UTC
  • mto: (2100.3.5 by-reference-trees)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: aaron.bentley@utoronto.ca-20060927041552-4283b801890541b6
Initial subsume implementation

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
803
803
            pb.finished()
804
804
        return conflicts
805
805
 
 
806
    @needs_write_lock
 
807
    def subsume(self, other_tree):
 
808
        other_tree_path = self.relpath(other_tree.basedir)
 
809
        other_root = other_tree.inventory.root
 
810
        other_root.parent_id = self.path2id(osutils.dirname(other_tree_path))
 
811
        assert other_root.parent_id is not None
 
812
        other_root.name = osutils.basename(other_tree_path)
 
813
        self.inventory.add(other_root)
 
814
        for parent_id in other_tree.get_parent_ids():
 
815
            self.add_parent_tree_id(parent_id)
 
816
 
 
817
 
806
818
    @needs_read_lock
807
819
    def merge_modified(self):
808
820
        try: