Rev 2951: Avoid dirstate parent resetting when it is not needed during revert. in http://people.ubuntu.com/~robertc/baz2.0/revert

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/revert

------------------------------------------------------------
revno: 2951
revision-id:robertc at robertcollins.net-20071030210601-poh10rzw97d51vxq
parent: robertc at robertcollins.net-20071030200323-2iyytqgqcltpngta
committer: Robert Collins <robertc at robertcollins.net>
branch nick: revert
timestamp: Wed 2007-10-31 08:06:01 +1100
message:
  Avoid dirstate parent resetting when it is not needed during revert.
modified:
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py	2007-10-30 20:03:23 +0000
+++ b/bzrlib/workingtree.py	2007-10-30 21:06:01 +0000
@@ -1968,7 +1968,7 @@
         try:
             conflicts = transform.revert(self, old_tree, filenames, backups, pb,
                                          report_changes)
-            if filenames is None:
+            if filenames is None and len(self.get_parent_ids()) > 1:
                 parent_trees = []
                 last_revision = self.last_revision()
                 if last_revision != NULL_REVISION: