← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Merge Repository.gather_stats api for hpss.

Show diffs side-by-side

added added

removed removed

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