/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/bzr/dirstate.py

  • Committer: Jelmer Vernooij
  • Date: 2020-07-18 23:14:00 UTC
  • mfrom: (7490.40.62 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200718231400-jaes9qltn8oi8xss
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/dirstate.py
523
523
                    file_id_entry[0][0], file_id_entry[0][1])
524
524
                kind = DirState._minikind_to_kind[file_id_entry[1][0][0]]
525
525
                info = '%s:%s' % (kind, path)
526
 
                raise errors.DuplicateFileId(file_id, info)
 
526
                raise inventory.DuplicateFileId(file_id, info)
527
527
        first_key = (dirname, basename, b'')
528
528
        block_index, present = self._find_block_index_from_key(first_key)
529
529
        if present: