Rev 3809: Handle committing new files again. in http://people.ubuntu.com/~robertc/baz2.0/integration

[Robert Collins]

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

------------------------------------------------------------
revno: 3809
revision-id: robertc at robertcollins.net-20090323034602-ofdxu119tl18koy1
parent: robertc at robertcollins.net-20090323030713-o0xmije7v3w07ujy
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2009-03-23 14:46:02 +1100
message:
  Handle committing new files again.
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2009-03-23 03:07:13 +0000
+++ b/bzrlib/repository.py	2009-03-23 03:46:02 +0000
@@ -670,7 +670,11 @@
                 carried_over = False
                 if len(heads) == 1:
                     # Could be a carry-over situation:
-                    parent_entry = parent_entries[file_id].get(heads[0], None)
+                    parent_entry_revs = parent_entries.get(file_id, None)
+                    if parent_entry_revs:
+                        parent_entry = parent_entry_revs.get(heads[0], None)
+                    else:
+                        parent_entry = None
                     if parent_entry is None:
                         # The parent iter_changes was called against is the one
                         # that is the per-file head, so any change is relevant