← 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: 2007-02-01 23:48:08 UTC
  • mfrom: (2225.1.6 revert)
  • Revision ID: pqm@pqm.ubuntu.com-20070201234808-3b1302d73474bd8c
Display changes made by revert

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1658
1658
 
1659
1659
    @needs_tree_write_lock
1660
1660
    def revert(self, filenames, old_tree=None, backups=True, 
1661
 
               pb=DummyProgress()):
 
1661
               pb=DummyProgress(), report_changes=False):
1662
1662
        from bzrlib.conflicts import resolve
1663
1663
        if old_tree is None:
1664
1664
            old_tree = self.basis_tree()
1665
 
        conflicts = transform.revert(self, old_tree, filenames, backups, pb)
 
1665
        conflicts = transform.revert(self, old_tree, filenames, backups, pb,
 
1666
                                     report_changes)
1666
1667
        if not len(filenames):
1667
1668
            self.set_parent_ids(self.get_parent_ids()[:1])
1668
1669
            resolve(self)