← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Robert Collins
  • Date: 2008-08-14 06:46:29 UTC
  • mfrom: (3628 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3629.
  • Revision ID: robertc@robertcollins.net-20080814064629-wuzmbxzw7tn27usi
Resolve conflicts in NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
291
291
            else:
292
292
                # we don't need to commit this, because the caller already
293
293
                # determined that an existing revision of this file is
294
 
                # appropriate.
295
 
                return None, (ie.revision == self._new_revision_id)
 
294
                # appropriate. If its not being considered for committing then
 
295
                # it and all its parents to the root must be unaltered so
 
296
                # no-change against the basis.
 
297
                if ie.revision == self._new_revision_id:
 
298
                    raise AssertionError("Impossible situation, a skipped "
 
299
                        "inventory entry (%r) claims to be modified in this "
 
300
                        "commit (%r).", (ie, self._new_revision_id))
 
301
                return None, False
296
302
        # XXX: Friction: parent_candidates should return a list not a dict
297
303
        #      so that we don't have to walk the inventories again.
298
304
        parent_candiate_entries = ie.parent_candidates(parent_invs)