← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Patch Queue Manager
  • Date: 2011-09-08 11:01:15 UTC
  • mfrom: (6123.1.16 gpg-typo)
  • Revision ID: pqm@cupuasso-20110908110115-gbb9benwkdksvzk5
(jelmer) Fix a typo (invalid format identifier) in an error message in
 bzrlib.gpg. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
38
38
    versionedfile,
39
39
    workingtree,
40
40
    )
41
 
from bzrlib.i18n import gettext
42
41
""")
43
42
from bzrlib import (
44
43
    decorators,
712
711
        merge = operation.run_simple()
713
712
        if len(merge.cooked_conflicts) == 0:
714
713
            if not self.ignore_zero and not trace.is_quiet():
715
 
                trace.note(gettext("All changes applied successfully."))
 
714
                trace.note("All changes applied successfully.")
716
715
        else:
717
 
            trace.note(gettext("%d conflicts encountered.")
 
716
            trace.note("%d conflicts encountered."
718
717
                       % len(merge.cooked_conflicts))
719
718
 
720
719
        return len(merge.cooked_conflicts)
859
858
            self.active_hooks = [hook for hook in hooks if hook is not None]
860
859
            for num, (file_id, changed, parents3, names3,
861
860
                      executable3) in enumerate(entries):
862
 
                child_pb.update(gettext('Preparing file merge'), num, len(entries))
 
861
                child_pb.update('Preparing file merge', num, len(entries))
863
862
                self._merge_names(file_id, parents3, names3, resolver=resolver)
864
863
                if changed:
865
864
                    file_status = self._do_merge_contents(file_id)
1907
1906
            entries = self._entries_to_incorporate()
1908
1907
            entries = list(entries)
1909
1908
            for num, (entry, parent_id) in enumerate(entries):
1910
 
                child_pb.update(gettext('Preparing file merge'), num, len(entries))
 
1909
                child_pb.update('Preparing file merge', num, len(entries))
1911
1910
                parent_trans_id = self.tt.trans_id_file_id(parent_id)
1912
1911
                trans_id = transform.new_by_entry(self.tt, entry,
1913
1912
                    parent_trans_id, self.other_tree)