← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Martin Pool
  • Date: 2010-01-15 05:33:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5019.
  • Revision ID: mbp@sourcefrog.net-20100115053328-z8lykwv6zmkmkp9p
Further progress bar string-pulling

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
4038
4038
        # list, we imply that the working tree text has seen and rejected
4039
4039
        # all the changes from the other tree, when in fact those changes
4040
4040
        # have not yet been seen.
4041
 
        pb = ui.ui_factory.nested_progress_bar()
4042
4041
        tree.set_parent_ids(parents[:1])
4043
4042
        try:
4044
 
            merger = _mod_merge.Merger.from_revision_ids(pb,
4045
 
                                                         tree, parents[1])
 
4043
            merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4046
4044
            merger.interesting_ids = interesting_ids
4047
4045
            merger.merge_type = merge_type
4048
4046
            merger.show_base = show_base
4050
4048
            conflicts = merger.do_merge()
4051
4049
        finally:
4052
4050
            tree.set_parent_ids(parents)
4053
 
            pb.finished()
4054
4051
        if conflicts > 0:
4055
4052
            return 1
4056
4053
        else: