Rev 3620: Tighten up the handling of carried-over inventory entries. in http://people.ubuntu.com/~robertc/baz2.0/bug-256409

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/bug-256409

------------------------------------------------------------
revno: 3620
revision-id: robertc at robertcollins.net-20080812071929-jf7qv5f2v7any84b
parent: pqm at pqm.ubuntu.com-20080811083307-tbibm26paa3r4hg8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bug-256409
timestamp: Tue 2008-08-12 17:19:29 +1000
message:
  Tighten up the handling of carried-over inventory entries.
modified:
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2008-07-31 06:26:44 +0000
+++ b/bzrlib/repository.py	2008-08-12 07:19:29 +0000
@@ -291,8 +291,13 @@
             else:
                 # we don't need to commit this, because the caller already
                 # determined that an existing revision of this file is
-                # appropriate.
-                return None, (ie.revision == self._new_revision_id)
+                # appropriate. If its not being considered for committing then
+                # it and all its parents to the root must be unaltered so
+                # no-change against the basis.
+                if ie.revision == self._new_revision_id:
+                    raise AssertionError("Impossible situation, a skipped "
+                        "inventory entry claims to be modified in this commit.")
+                return None, False
         # XXX: Friction: parent_candidates should return a list not a dict
         #      so that we don't have to walk the inventories again.
         parent_candiate_entries = ie.parent_candidates(parent_invs)