← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/multiparent.py

(jelmer) Fix bug #1010339,
 use encoding_type='exact' for bzr testament (John A Meinel)

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
 
 
19
17
from bzrlib.lazy_import import lazy_import
20
18
 
21
19
lazy_import(globals(), """
423
421
                            if not (lines == self.get_line_list([revision])[0]):
424
422
                                raise AssertionError()
425
423
                            self.clear_cache()
426
 
                    pb.update(gettext('Importing revisions'),
 
424
                    pb.update('Importing revisions',
427
425
                              (total - len(revisions)) + len(added), total)
428
426
                revisions = [r for r in revisions if r not in added]
429
427
        finally: