← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-03-08 00:37:41 UTC
  • mfrom: (1594.2.4 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060308003741-08afccbf89005e87
Merge in :
 * Knit repositories use knits
 * Nested progress bar support.
 * Ghost aware graph api.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
887
887
                else:
888
888
                    other_revision = None
889
889
                repository = self.branch.repository
890
 
                merge_inner(self.branch,
891
 
                            self.branch.basis_tree(),
892
 
                            basis_tree, 
893
 
                            this_tree=self, 
894
 
                            pb=bzrlib.ui.ui_factory.progress_bar())
 
890
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
891
                try:
 
892
                    merge_inner(self.branch,
 
893
                                self.branch.basis_tree(),
 
894
                                basis_tree, 
 
895
                                this_tree=self, 
 
896
                                pb=pb)
 
897
                finally:
 
898
                    pb.finished()
895
899
                self.set_last_revision(self.branch.last_revision())
896
900
            return count
897
901
        finally: