Rev 2952: (robertc) Avoid resetting dirstate parent data during revert if the parents list has not changed. (Robert Collins) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2952
revision-id: pqm at pqm.ubuntu.com-20071030223954-0ussb5qn1dy2fg8v
parent: pqm at pqm.ubuntu.com-20071030214613-c0ojrpmnm21da068
parent: robertc at robertcollins.net-20071030210601-poh10rzw97d51vxq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-10-30 22:39:54 +0000
message:
  (robertc) Avoid resetting dirstate parent data during revert if the parents list has not changed. (Robert Collins)
modified:
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    revno: 2949.2.2
    merged: 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 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: