← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-10-30 22:39:54 UTC
  • mfrom: (2949.2.2 revert)
  • Revision ID: pqm@pqm.ubuntu.com-20071030223954-0ussb5qn1dy2fg8v
(robertc) Avoid resetting dirstate parent data during revert if the parents list has not changed. (Robert Collins)

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: