← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Robert Collins
  • Date: 2006-02-22 05:45:47 UTC
  • mto: (1570.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1567.
  • Revision ID: robertc@robertcollins.net-20060222054547-70f045f317b7993b
Fix 'bzr pull' on metadir trees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
840
840
        source.lock_read()
841
841
        try:
842
842
            old_revision_history = self.branch.revision_history()
 
843
            basis_tree = self.basis_tree()
843
844
            count = self.branch.pull(source, overwrite, stop_revision)
844
845
            new_revision_history = self.branch.revision_history()
845
846
            if new_revision_history != old_revision_history:
849
850
                    other_revision = None
850
851
                repository = self.branch.repository
851
852
                merge_inner(self.branch,
852
 
                            self.basis_tree(), 
853
 
                            repository.revision_tree(other_revision),
 
853
                            self.branch.basis_tree(),
 
854
                            basis_tree, 
854
855
                            this_tree=self, 
855
856
                            pb=bzrlib.ui.ui_factory.progress_bar())
856
857
                self.set_last_revision(self.branch.last_revision())