/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Matthieu Moy
  • Date: 2006-09-09 17:33:43 UTC
  • mto: (2009.1.1 update-r)
  • mto: This revision was merged to the branch mainline in revision 4923.
  • Revision ID: Matthieu.Moy@imag.fr-20060909173343-c3f80d5539451752
Simple fixes (deprecation warning, use revision where needed)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1631
1631
            self.set_last_revision(revision)
1632
1632
            # TODO - dedup parents list with things merged by pull ?
1633
1633
            # reuse the tree we've updated to to set the basis:
1634
 
            parent_trees = [(self.branch.last_revision(), to_tree)]
 
1634
            parent_trees = [(revision, to_tree)]
1635
1635
            merges = self.get_parent_ids()[1:]
1636
1636
            # Ideally we ask the tree for the trees here, that way the working
1637
1637
            # tree can decide whether to give us teh entire tree or give us a