Merge lp:~jelmer/brz/patch-1 into lp:brz

[Jelmer Vernooij]

Add missing controldir import to branch_updater

Add missing controldir import to branch_updater

https://github.com/breezy-team/breezy/pull/125

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/plugins/fastimport/branch_updater.py'
--- breezy/plugins/fastimport/branch_updater.py	2020-02-18 01:57:45 +0000
+++ breezy/plugins/fastimport/branch_updater.py	2022-09-17 14:16:55 +0000
@@ -20,6 +20,7 @@
 from ... import errors, osutils, transport
 from ...trace import show_error, note
 
+from breezy import controldir
 from .helpers import (
     best_format_for_objects_in_a_repository,
     single_plural,