← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: John Arbash Meinel
  • Date: 2011-09-26 07:56:05 UTC
  • mfrom: (6165 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6170.
  • Revision ID: john@arbash-meinel.com-20110926075605-czuukdiawz68dpbd
Merge bzr.dev 6165, resolve conflicts.

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