/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: Canonical.com Patch Queue Manager
  • Date: 2007-11-23 21:35:00 UTC
  • mfrom: (3017.2.2 revert)
  • Revision ID: pqm@pqm.ubuntu.com-20071123213500-mrqqeapz0f1mcfs3
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()