← 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: 2007-11-23 20:19:57 UTC
  • mto: This revision was merged to the branch mainline in revision 3021.
  • Revision ID: abentley@panoramicfeedback.com-20071123201957-xntyi59nfugfz2u1
https://launchpad.net/bugs/102739
Revert now resolves conflicts recursively (#102739)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1982
1982
                self.set_parent_trees(parent_trees)
1983
1983
                resolve(self)
1984
1984
            else:
1985
 
                resolve(self, filenames, ignore_misses=True)
 
1985
                resolve(self, filenames, ignore_misses=True, recursive=True)
1986
1986
        finally:
1987
1987
            if basis_tree is not None:
1988
1988
                basis_tree.unlock()