← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/multiparent.py

  • Committer: Patch Queue Manager
  • Date: 2011-10-06 10:15:06 UTC
  • mfrom: (6195.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20111006101506-mychax14dy7yjee2
(vila) Tag bzr-2.5b2 missed during freeze (Vincent Ladeuil)

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: