Rev 4675: Bugfix tree reference support in dirstate update_by_delta. in http://bazaar.launchpad.net/~lifeless/bzr/2.0

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/2.0

------------------------------------------------------------
revno: 4675
revision-id: robertc at robertcollins.net-20091001005052-oynl7kyor0m08tif
parent: robertc at robertcollins.net-20090930213849-0vyqtge2lfd16nx5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 2.0
timestamp: Thu 2009-10-01 10:50:52 +1000
message:
  Bugfix tree reference support in dirstate update_by_delta.
=== modified file 'bzrlib/dirstate.py'
--- a/bzrlib/dirstate.py	2009-08-26 03:20:32 +0000
+++ b/bzrlib/dirstate.py	2009-10-01 00:50:52 +0000
@@ -1324,7 +1324,7 @@
                 key = (dirname_utf8, basename, file_id)
                 minikind = DirState._kind_to_minikind[inv_entry.kind]
                 if minikind == 't':
-                    fingerprint = inv_entry.reference_revision
+                    fingerprint = inv_entry.reference_revision or ''
                 else:
                     fingerprint = ''
                 insertions[file_id] = (key, minikind, inv_entry.executable,