← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/multiparent.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/multiparent.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
from bzrlib.lazy_import import lazy_import
18
20
 
19
21
lazy_import(globals(), """
421
423
                            if not (lines == self.get_line_list([revision])[0]):
422
424
                                raise AssertionError()
423
425
                            self.clear_cache()
424
 
                    pb.update('Importing revisions',
 
426
                    pb.update(gettext('Importing revisions'),
425
427
                              (total - len(revisions)) + len(added), total)
426
428
                revisions = [r for r in revisions if r not in added]
427
429
        finally: