← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Jonathan Riddell
  • Date: 2011-09-19 15:59:40 UTC
  • mto: This revision was merged to the branch mainline in revision 6150.
  • Revision ID: jriddell@canonical.com-20110919155940-4q4itcff3jhmhg6u
use .format() instead of % for string formatting where there are multiple formats in one string to allow for translations

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
162
162
            # set_revision_history, as this will regenerate it again.
163
163
            # Not really worth a whole BranchReconciler class just for this,
164
164
            # though.
165
 
            ui.ui_factory.note(gettext('Fixing last revision info %s => %s') % (
166
 
                 last_revno, len(real_history)))
 
165
            ui.ui_factory.note(gettext('Fixing last revision info {0} '\
 
166
                                       ' => {1}').format(
 
167
                                       last_revno, len(real_history)))
167
168
            self.branch.set_last_revision_info(len(real_history),
168
169
                                               last_revision_id)
169
170
        else: