/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: Robert Collins
  • Date: 2007-10-30 21:06:01 UTC
  • mto: This revision was merged to the branch mainline in revision 2952.
  • Revision ID: robertc@robertcollins.net-20071030210601-poh10rzw97d51vxq
Avoid dirstate parent resetting when it is not needed during revert.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1968
1968
        try:
1969
1969
            conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1970
1970
                                         report_changes)
1971
 
            if filenames is None:
 
1971
            if filenames is None and len(self.get_parent_ids()) > 1:
1972
1972
                parent_trees = []
1973
1973
                last_revision = self.last_revision()
1974
1974
                if last_revision != NULL_REVISION: