diff -Nru breezy-debian-2.8.35+20200508/debian/bzr-builder.manifest breezy-debian-2.8.36+20200528/debian/bzr-builder.manifest --- breezy-debian-2.8.35+20200508/debian/bzr-builder.manifest 2020-05-08 01:33:01.000000000 +0000 +++ breezy-debian-2.8.36+20200528/debian/bzr-builder.manifest 2020-05-28 23:16:18.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.4 deb-version 2.8.35+20200508-0daily -lp:brz-debian revid:jelmer@jelmer.uk-20200508011231-rhzk0lj8riq38476 +# bzr-builder format 0.4 deb-version 2.8.36+20200528-0daily +lp:brz-debian revid:jelmer@jelmer.uk-20200528230904-si1tsm81cgi5e72t diff -Nru breezy-debian-2.8.35+20200508/debian/changelog breezy-debian-2.8.36+20200528/debian/changelog --- breezy-debian-2.8.35+20200508/debian/changelog 2020-05-08 01:33:01.000000000 +0000 +++ breezy-debian-2.8.36+20200528/debian/changelog 2020-05-28 23:16:18.000000000 +0000 @@ -1,8 +1,14 @@ -breezy-debian (2.8.35+20200508-0daily~ubuntu20.04.1) focal; urgency=low +breezy-debian (2.8.36+20200528-0daily~ubuntu20.04.1) focal; urgency=low * Auto build. - -- Peter J. Mello Fri, 08 May 2020 01:33:01 +0000 + -- Peter J. Mello Thu, 28 May 2020 23:16:18 +0000 + +breezy-debian (2.8.36) UNRELEASED; urgency=medium + + * Don't use file ids if the underlying tree does not support them. + + -- Jelmer Vernooij Thu, 28 May 2020 23:09:02 +0000 breezy-debian (2.8.35) unstable; urgency=medium diff -Nru breezy-debian-2.8.35+20200508/import_dsc.py breezy-debian-2.8.36+20200528/import_dsc.py --- breezy-debian-2.8.35+20200508/import_dsc.py 2020-05-08 01:33:01.000000000 +0000 +++ breezy-debian-2.8.36+20200528/import_dsc.py 2020-05-28 23:16:18.000000000 +0000 @@ -931,8 +931,11 @@ current_config.write() dirname = osutils.dirname(config_relpath) dir_id = poss_native_tree.path2id(dirname) - self.tree.add([dirname, config_relpath], - ids=[dir_id, config_fileid]) + if self.tree.supports_setting_file_ids(): + self.tree.add([dirname, config_relpath], + ids=[dir_id, config_fileid]) + else: + self.tree.add([dirname, config_relpath]) if native != current_native: if current_config is None: needs_add = True