← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store.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/store.py
114
114
    def copy_multi(self, other, ids, permit_failure=False):
115
115
        """Copy texts for ids from other into self.
116
116
 
117
 
        If an id is present in self, it is skipped.  A count of copied
118
 
        ids is returned, which may be less than len(ids).
 
117
        If an id is present in self, it is skipped.
 
118
 
 
119
        Returns (count_copied, failed), where failed is a collection of ids
 
120
        that could not be copied.
119
121
        """
120
122
        pb = bzrlib.ui.ui_factory.progress_bar()
121
123
        
139
141
                
140
142
        assert count == len(to_copy)
141
143
        pb.clear()
142
 
        return count
 
144
        return count, []
143
145
 
144
146
 
145
147
    def copy_multi_immutable(self, other, to_copy, pb, permit_failure=False):