← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Martin Pool
  • Date: 2005-08-25 09:17:19 UTC
  • Revision ID: mbp@sourcefrog.net-20050825091719-b2d7be7bf56bb35a
- fix a few errors in new merge code

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
834
834
            count = 0
835
835
        self.append_revision(*revision_ids)
836
836
        ## note("Added %d revisions." % count)
 
837
        pb.clear()
837
838
 
838
839
        
 
840
        
839
841
    def install_revisions(self, other, revision_ids, pb):
840
842
        if hasattr(other.revision_store, "prefetch"):
841
843
            other.revision_store.prefetch(revision_ids)
872
874
                    
873
875
        count, cp_fail = self.text_store.copy_multi(other.text_store, 
874
876
                                                    needed_texts)
875
 
        print "Added %d texts." % count 
 
877
        #print "Added %d texts." % count 
876
878
        inventory_ids = [ f.inventory_id for f in revisions ]
877
879
        count, cp_fail = self.inventory_store.copy_multi(other.inventory_store, 
878
880
                                                         inventory_ids)
879
 
        print "Added %d inventories." % count 
 
881
        #print "Added %d inventories." % count 
880
882
        revision_ids = [ f.revision_id for f in revisions]
881
883
 
882
884
        count, cp_fail = self.revision_store.copy_multi(other.revision_store,