Rev 5884: Merge Jelmers quick-fixes to the code. in http://bazaar.launchpad.net/~jameinel/bzr/2.4-set-parent-trees-delta-282941

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.4-set-parent-trees-delta-282941

------------------------------------------------------------
revno: 5884 [merge]
revision-id: john at arbash-meinel.com-20110519150502-3twg6kmct21yeyxx
parent: john at arbash-meinel.com-20110519150258-qbvu80sa6qp7ndu1
parent: jelmer at samba.org-20110519145124-3ke42ykqhz3int7r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.4-set-parent-trees-delta-282941
timestamp: Thu 2011-05-19 17:05:02 +0200
message:
  Merge Jelmers quick-fixes to the code.
modified:
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
-------------- next part --------------
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2011-05-18 09:52:44 +0000
+++ b/bzrlib/workingtree_4.py	2011-05-19 14:51:24 +0000
@@ -1149,7 +1149,8 @@
         if (len(real_trees) == 1
             and not ghosts
             and self.branch.repository._format.fast_deltas
-            and isinstance(real_trees[0][1], revisiontree.RevisionTree)
+            and isinstance(real_trees[0][1],
+                revisiontree.InventoryRevisionTree)
             and self.get_parent_ids()):
             rev_id, rev_tree = real_trees[0]
             basis_id = self.get_parent_ids()[0]

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-05-18 05:01:00 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-05-19 14:51:24 +0000
@@ -63,7 +63,7 @@
 
 * Speed up ``bzr uncommit``. Instead of resetting the dirstate from
   scratch, use ``update_basis_by_delta``, computing the delta from the
-  repsository. (John Arbash Meinel, #780544)
+  repository. (John Arbash Meinel, #780544)
 
 Bug Fixes
 *********