← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2009-03-08 01:32:37 UTC
  • mto: This revision was merged to the branch mainline in revision 4095.
  • Revision ID: aaron@aaronbentley.com-20090308013237-1gq0ezk3vej5kr20
Fix progress warning

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
89
89
        self.interesting_files = None
90
90
        self.show_base = False
91
91
        self.reprocess = False
 
92
        if pb is None:
 
93
            pb = DummyProgress()
92
94
        self._pb = pb
93
95
        self.pp = None
94
96
        self.recurse = recurse
132
134
                                      _set_base_is_other_ancestor)
133
135
 
134
136
    @staticmethod
135
 
    def from_uncommitted(tree, other_tree, pb, base_tree=None):
 
137
    def from_uncommitted(tree, other_tree, pb=None, base_tree=None):
136
138
        """Return a Merger for uncommitted changes in other_tree.
137
139
 
138
140
        :param tree: The tree to merge into