← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

[merge] fix weave join to display nicer progress messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
163
163
        count = 0
164
164
        num_file_ids = len(file_ids)
165
165
        for file_id in file_ids:
166
 
            self.pb.update("merge weave merge", count, num_file_ids)
 
166
            self.pb.update("merge weaves", count, num_file_ids)
167
167
            count +=1
168
168
            to_weave = self.to_weaves.get_weave_or_empty(file_id,
169
169
                self.to_branch.get_transaction())