← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Robert Collins
  • Date: 2009-07-14 00:20:03 UTC
  • mto: This revision was merged to the branch mainline in revision 4553.
  • Revision ID: robertc@robertcollins.net-20090714002003-ingqr8vlkz5577v1
Require that added ids in inventory deltas be new.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
1170
1170
                new_entry = replacement
1171
1171
            try:
1172
1172
                self.add(new_entry)
 
1173
            except errors.DuplicateFileId:
 
1174
                raise errors.InconsistentDelta(new_path, new_entry.file_id,
 
1175
                    "New id is already present in target.")
1173
1176
            except AttributeError:
1174
1177
                raise errors.InconsistentDelta(new_path, new_entry.file_id,
1175
1178
                    "Parent is not a directory.")