← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2006-03-10 18:13:13 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1647.
  • Revision ID: abentley@panoramicfeedback.com-20060310181313-1865330914401573
Made revert clear conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1134
1134
    def revert(self, filenames, old_tree=None, backups=True, 
1135
1135
               pb=DummyProgress()):
1136
1136
        from transform import revert
 
1137
        from conflicts import resolve
1137
1138
        if old_tree is None:
1138
1139
            old_tree = self.basis_tree()
1139
1140
        revert(self, old_tree, filenames, backups, pb)
1140
1141
        if not len(filenames):
1141
1142
            self.set_pending_merges([])
 
1143
            resolve(self)
 
1144
        else:
 
1145
            resolve(self, filenames)
1142
1146
 
1143
1147
    @needs_write_lock
1144
1148
    def set_inventory(self, new_inventory_list):