Rev 5856: Have to set update=True if you don't want to do the work 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: 5856
revision-id: john at arbash-meinel.com-20110518054743-8pmdzxrp3omroswn
parent: john at arbash-meinel.com-20110518050648-ag00febzpl0y7ahk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.4-set-parent-trees-delta-282941
timestamp: Wed 2011-05-18 07:47:43 +0200
message:
  Have to set update=True if you don't want to do the work
-------------- next part --------------
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2011-05-18 05:06:48 +0000
+++ b/bzrlib/workingtree_4.py	2011-05-18 05:47:43 +0000
@@ -1162,6 +1162,7 @@
             else:
                 delta = rev_tree.inventory._make_delta(basis_tree.inventory)
                 dirstate.update_basis_by_delta(delta, rev_id)
+                updated = True
         if not updated:
             dirstate.set_parent_trees(real_trees, ghosts=ghosts)
         self._make_dirty(reset_inventory=False)