← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/multiparent.py

  • Committer: Jelmer Vernooij
  • Date: 2011-09-26 11:00:20 UTC
  • mfrom: (6167 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6169.
  • Revision ID: jelmer@samba.org-20110926110020-g86tgisgnuajlc2n
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/multiparent.py
421
421
                            if not (lines == self.get_line_list([revision])[0]):
422
422
                                raise AssertionError()
423
423
                            self.clear_cache()
424
 
                    pb.update('Importing revisions',
 
424
                    pb.update(gettext('Importing revisions'),
425
425
                              (total - len(revisions)) + len(added), total)
426
426
                revisions = [r for r in revisions if r not in added]
427
427
        finally: