Merge lp:~jelmer/brz/bees into lp:brz

[Jelmer Vernooij]

Add more bees in places, get more tests to pass on Python 3.

[Martin Packman (gz)]

This is likely all reasonable - I'll note when adding b-s to file ids I've been trying to add u-s to paths on the same lines.

[Jelmer Vernooij (jelmer)]

> This is likely all reasonable - I'll note when adding b-s to file ids I've
> been trying to add u-s to paths on the same lines.
Ah, that makes sense. I'll do that for future MPs.

[Martin Packman (gz)]

Thanks, a few comments in line but only for future reference.

review: Approve

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz-dev/83/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-dev/84/

=== modified file 'breezy/bundle/serializer/__init__.py'
--- breezy/bundle/serializer/__init__.py	2017-08-26 13:58:53 +0000
+++ breezy/bundle/serializer/__init__.py	2018-03-24 23:50:35 +0000
@@ -38,9 +38,9 @@
 # New bundles should try to use this header format
 BUNDLE_HEADER = '# Bazaar revision bundle v'
 BUNDLE_HEADER_RE = re.compile(
-    r'^# Bazaar revision bundle v(?P<version>\d+[\w.]*)(?P<lineending>\r?)\n$')
+    br'^# Bazaar revision bundle v(?P<version>\d+[\w.]*)(?P<lineending>\r?)\n$')
 CHANGESET_OLD_HEADER_RE = re.compile(
-    r'^# Bazaar-NG changeset v(?P<version>\d+[\w.]*)(?P<lineending>\r?)\n$')
+    br'^# Bazaar-NG changeset v(?P<version>\d+[\w.]*)(?P<lineending>\r?)\n$')
 
 
 _serializers = {}

=== modified file 'breezy/bzr/branch.py'
--- breezy/bzr/branch.py	2018-03-24 17:48:04 +0000
+++ breezy/bzr/branch.py	2018-03-24 23:50:35 +0000
@@ -348,7 +348,7 @@
         with self.lock_write():
             self._master_branch_cache = None
             if location:
-                self._transport.put_bytes('bound', location+'\n',
+                self._transport.put_bytes('bound', location+b'\n',
                     mode=self.controldir._get_file_mode())
             else:
                 try:

=== modified file 'breezy/bzr/chk_serializer.py'
--- breezy/bzr/chk_serializer.py	2018-02-17 00:06:35 +0000
+++ breezy/bzr/chk_serializer.py	2018-03-24 23:50:35 +0000
@@ -93,7 +93,7 @@
         # which changes infrequently.
         revprops = {}
         for key, value in rev.properties.items():
-            revprops[key] = encode_utf8(value)[0]
+            revprops[encode_utf8(key)[0]] = encode_utf8(value)[0]
         ret.append((b'properties', revprops))
         ret.extend([
             (b"timestamp", b"%.3f" % rev.timestamp),

=== modified file 'breezy/bzr/index.py'
--- breezy/bzr/index.py	2017-07-23 18:16:19 +0000
+++ breezy/bzr/index.py	2018-03-24 23:50:35 +0000
@@ -171,8 +171,8 @@
         if self._key_length != len(key):
             raise BadIndexKey(key)
         for element in key:
-            if not element or _whitespace_re.search(element) is not None:
-                raise BadIndexKey(element)
+            if not element or type(element) != bytes or _whitespace_re.search(element) is not None:
+                raise BadIndexKey(key)
 
     def _external_references(self):
         """Return references that are not present in this index.
@@ -530,7 +530,7 @@
         self._nodes_by_key = None
         trailers = 0
         pos = stream.tell()
-        lines = stream.read().split('\n')
+        lines = stream.read().split(b'\n')
         # GZ 2009-09-20: Should really use a try/finally block to ensure close
         stream.close()
         del lines[-1]
@@ -1140,7 +1140,7 @@
                         raise AssertionError("%s %s" % (self._size, pos))
                 trailers += 1
                 continue
-            elements = line.split('\0')
+            elements = line.split(b'\0')
             if len(elements) != self._expected_elements:
                 raise BadIndexData(self)
             # keys are tuples. Each element is a string that may occur many

=== modified file 'breezy/bzr/inventorytree.py'
--- breezy/bzr/inventorytree.py	2018-03-24 10:24:48 +0000
+++ breezy/bzr/inventorytree.py	2018-03-24 23:50:35 +0000
@@ -568,8 +568,8 @@
         # Find a 'best fit' match if the filesystem is case-insensitive
         inv_path = self.tree._fix_case_of_inventory_path(inv_path)
         try:
-            return self.tree.iter_entries_by_dir(
-                    specific_files=[inv_path]).next()[1]
+            return next(self.tree.iter_entries_by_dir(
+                    specific_files=[inv_path]))[1]
         except StopIteration:
             return None
 
@@ -594,9 +594,9 @@
         :param parent_ie: Parent inventory entry if known, or None.  If
             None, the parent is looked up by name and used if present, otherwise it
             is recursively added.
-        :param path: 
+        :param path: Filesystem path to add
         :param kind: Kind of new entry (file, directory, etc)
-        :param inv_path:
+        :param inv_path: Inventory path
         :return: Inventory entry for path and a list of paths which have been added.
         """
         # Nothing to do if path is already versioned.

=== modified file 'breezy/bzr/knit.py'
--- breezy/bzr/knit.py	2018-02-17 02:54:17 +0000
+++ breezy/bzr/knit.py	2018-03-24 23:50:35 +0000
@@ -1058,11 +1058,11 @@
             lines = osutils.split_lines(line_bytes)
 
         for element in key[:-1]:
-            if not isinstance(element, str):
+            if not isinstance(element, bytes):
                 raise TypeError("key contains non-strings: %r" % (key,))
         if key[-1] is None:
             key = key[:-1] + ('sha1:' + digest,)
-        elif not isinstance(key[-1], str):
+        elif not isinstance(key[-1], bytes):
                 raise TypeError("key contains non-strings: %r" % (key,))
         # Knit hunks are still last-element only
         version_id = key[-1]
@@ -1080,7 +1080,7 @@
         if delta:
             options.append('line-delta')
             store_lines = self._factory.lower_line_delta(delta_hunks)
-            size, bytes = self._record_to_data(key, digest,
+            size, data = self._record_to_data(key, digest,
                 store_lines)
         else:
             options.append('fulltext')
@@ -1091,16 +1091,16 @@
                 dense_lines = [line_bytes]
                 if no_eol:
                     dense_lines.append('\n')
-                size, bytes = self._record_to_data(key, digest,
+                size, data = self._record_to_data(key, digest,
                     lines, dense_lines)
             else:
                 # get mixed annotation + content and feed it into the
                 # serialiser.
                 store_lines = self._factory.lower_fulltext(content)
-                size, bytes = self._record_to_data(key, digest,
+                size, data = self._record_to_data(key, digest,
                     store_lines)
 
-        access_memo = self._access.add_raw_records([(key, size)], bytes)[0]
+        access_memo = self._access.add_raw_records([(key, size)], data)[0]
         self._index.add_records(
             ((key, options, access_memo, parents),),
             random_id=random_id)
@@ -2447,7 +2447,7 @@
         ABI change with the C extension that reads .kndx files.
     """
 
-    HEADER = "# bzr knit index 8\n"
+    HEADER = b"# bzr knit index 8\n"
 
     def __init__(self, transport, mapper, get_scope, allow_writes, is_locked):
         """Create a _KndxIndex on transport using mapper."""

=== modified file 'breezy/bzr/pack_repo.py'
--- breezy/bzr/pack_repo.py	2018-02-17 00:06:35 +0000
+++ breezy/bzr/pack_repo.py	2018-03-24 23:50:35 +0000
@@ -465,7 +465,7 @@
             return
         self._writer.end()
         if self._buffer[1]:
-            self._write_data('', flush=True)
+            self._write_data(b'', flush=True)
         self.name = self._hash.hexdigest()
 
     def finish(self, suspend=False):

=== modified file 'breezy/bzr/smart/protocol.py'
--- breezy/bzr/smart/protocol.py	2017-06-11 20:15:04 +0000
+++ breezy/bzr/smart/protocol.py	2018-03-24 23:50:35 +0000
@@ -40,6 +40,7 @@
     reraise,
 )
 from . import message, request
+from ...sixish import text_type
 from ...trace import log_exception_quietly, mutter
 from ...bencode import bdecode_as_tuple, bencode
 
@@ -47,10 +48,10 @@
 # Protocol version strings.  These are sent as prefixes of bzr requests and
 # responses to identify the protocol version being used. (There are no version
 # one strings because that version doesn't send any).
-REQUEST_VERSION_TWO = 'bzr request 2\n'
-RESPONSE_VERSION_TWO = 'bzr response 2\n'
+REQUEST_VERSION_TWO = b'bzr request 2\n'
+RESPONSE_VERSION_TWO = b'bzr response 2\n'
 
-MESSAGE_VERSION_THREE = 'bzr message 3 (bzr 1.6)\n'
+MESSAGE_VERSION_THREE = b'bzr message 3 (bzr 1.6)\n'
 RESPONSE_VERSION_THREE = REQUEST_VERSION_THREE = MESSAGE_VERSION_THREE
 
 
@@ -60,17 +61,17 @@
 
 
 def _decode_tuple(req_line):
-    if req_line is None or req_line == '':
+    if req_line is None or req_line == b'':
         return None
-    if req_line[-1] != '\n':
+    if req_line[-1] != b'\n':
         raise errors.SmartProtocolError("request %r not terminated" % req_line)
     return tuple(req_line[:-1].split('\x01'))
 
 
 def _encode_tuple(args):
     """Encode the tuple args to a bytestream."""
-    joined = '\x01'.join(args) + '\n'
-    if isinstance(joined, unicode):
+    joined = b'\x01'.join(args) + b'\n'
+    if isinstance(joined, text_type):
         # XXX: We should fix things so this never happens!  -AJB, 20100304
         mutter('response args contain unicode, should be only bytes: %r',
                joined)
@@ -795,11 +796,11 @@
 
     def query_version(self):
         """Return protocol version number of the server."""
-        self.call('hello')
+        self.call(b'hello')
         resp = self.read_response_tuple()
-        if resp == ('ok', '1'):
+        if resp == (b'ok', '1'):
             return 1
-        elif resp == ('ok', '2'):
+        elif resp == (b'ok', '2'):
             return 2
         else:
             raise errors.SmartProtocolError("bad response %r" % (resp,))
@@ -1126,7 +1127,7 @@
         self._write_func('s')
         utf8_args = []
         for arg in args:
-            if isinstance(arg, unicode):
+            if isinstance(arg, text_type):
                 utf8_args.append(arg.encode('utf8'))
             else:
                 utf8_args.append(arg)

=== modified file 'breezy/bzr/vf_repository.py'
--- breezy/bzr/vf_repository.py	2018-02-24 15:50:23 +0000
+++ breezy/bzr/vf_repository.py	2018-03-24 23:50:35 +0000
@@ -1851,7 +1851,7 @@
         # read back from the inserted data, so flush the writes to the new pack
         # (if this is pack format).
         if new_pack is not None:
-            new_pack._write_data('', flush=True)
+            new_pack._write_data(b'', flush=True)
         # Find all the new revisions (including ones from resume_tokens)
         missing_keys = self.target_repo.get_missing_parent_inventories(
             check_for_missing_texts=is_resume)

=== modified file 'breezy/bzr/weavefile.py'
--- breezy/bzr/weavefile.py	2018-02-17 00:06:35 +0000
+++ breezy/bzr/weavefile.py	2018-03-24 23:50:35 +0000
@@ -133,9 +133,9 @@
     # read weave header.
     while True:
         l = next(lines)
-        if l[0] == 'i':
+        if l[0:1] == b'i':
             if len(l) > 2:
-                w._parents.append(list(map(int, l[2:].split(' '))))
+                w._parents.append(list(map(int, l[2:].split(b' '))))
             else:
                 w._parents.append([])
             l = lines.next()[:-1]
@@ -146,7 +146,7 @@
             w._name_map[name] = ver
             l = next(lines)
             ver += 1
-        elif l == 'w\n':
+        elif l == b'w\n':
             break
         else:
             raise WeaveFormatError('unexpected line %r' % l)
@@ -154,14 +154,14 @@
     # read weave body
     while True:
         l = next(lines)
-        if l == 'W\n':
+        if l == b'W\n':
             break
-        elif '. ' == l[0:2]:
+        elif b'. ' == l[0:2]:
             w._weave.append(l[2:])  # include newline
-        elif ', ' == l[0:2]:
+        elif b', ' == l[0:2]:
             w._weave.append(l[2:-1])        # exclude newline
-        elif l == '}\n':
-            w._weave.append(('}', None))
+        elif l == b'}\n':
+            w._weave.append((b'}', None))
         else:
             w._weave.append((intern(l[0]), int(l[2:])))
     return w

=== modified file 'breezy/bzr/xml5.py'
--- breezy/bzr/xml5.py	2017-06-08 23:30:31 +0000
+++ breezy/bzr/xml5.py	2018-03-24 23:50:35 +0000
@@ -99,18 +99,18 @@
     def _append_inventory_root(self, append, inv):
         """Append the inventory root to output."""
         if inv.root.file_id not in (None, inventory.ROOT_ID):
-            fileid1 = ' file_id="'
+            fileid1 = b' file_id="'
             fileid2 = encode_and_escape(inv.root.file_id)
         else:
-            fileid1 = ""
-            fileid2 = ""
+            fileid1 = b""
+            fileid2 = b""
         if inv.revision_id is not None:
-            revid1 = ' revision_id="'
+            revid1 = b' revision_id="'
             revid2 = encode_and_escape(inv.revision_id)
         else:
-            revid1 = ""
-            revid2 = ""
-        append('<inventory%s%s format="5"%s%s>\n' % (
+            revid1 = b""
+            revid2 = b""
+        append(b'<inventory%s%s format="5"%s%s>\n' % (
             fileid1, fileid2, revid1, revid2))
 
 

=== modified file 'breezy/bzr/xml8.py'
--- breezy/bzr/xml8.py	2017-10-27 00:18:42 +0000
+++ breezy/bzr/xml8.py	2018-03-24 23:50:35 +0000
@@ -168,14 +168,14 @@
     def _append_inventory_root(self, append, inv):
         """Append the inventory root to output."""
         if inv.revision_id is not None:
-            revid1 = ' revision_id="'
+            revid1 = b' revision_id="'
             revid2 = encode_and_escape(inv.revision_id)
         else:
-            revid1 = ""
-            revid2 = ""
-        append('<inventory format="%s"%s%s>\n' % (
+            revid1 = b""
+            revid2 = b""
+        append(b'<inventory format="%s"%s%s>\n' % (
             self.format_num, revid1, revid2))
-        append('<directory file_id="%s name="%s revision="%s />\n' % (
+        append(b'<directory file_id="%s name="%s revision="%s />\n' % (
             encode_and_escape(inv.root.file_id),
             encode_and_escape(inv.root.name),
             encode_and_escape(inv.root.revision)))

=== modified file 'breezy/bzr/xml_serializer.py'
--- breezy/bzr/xml_serializer.py	2017-11-12 13:53:51 +0000
+++ breezy/bzr/xml_serializer.py	2018-03-24 23:50:35 +0000
@@ -47,6 +47,7 @@
     errors,
     lazy_regex,
     )
+from ..sixish import text_type
 from . import (
     inventory,
     serializer,
@@ -147,13 +148,13 @@
     # This is fairly optimized because we know what cElementTree does, this is
     # not meant as a generic function for all cases. Because it is possible for
     # an 8-bit string to not be ascii or valid utf8.
-    if a_str.__class__ is unicode:
+    if a_str.__class__ is text_type:
         return _encode_utf8(a_str)
     else:
         return intern(a_str)
 
 
-_utf8_re = lazy_regex.lazy_compile('[&<>\'\"]|[\x80-\xff]+')
+_utf8_re = lazy_regex.lazy_compile(b'[&<>\'\"]|[\x80-\xff]+')
 _unicode_re = lazy_regex.lazy_compile(u'[&<>\'\"\u0080-\uffff]')
 
 
@@ -208,7 +209,7 @@
     # to check if None, rather than try/KeyError
     text = _map.get(unicode_or_utf8_str)
     if text is None:
-        if unicode_or_utf8_str.__class__ is unicode:
+        if unicode_or_utf8_str.__class__ is text_type:
             # The alternative policy is to do a regular UTF8 encoding
             # and then escape only XML meta characters.
             # Performance is equivalent once you use cache_utf8. *However*
@@ -216,13 +217,12 @@
             # of bzr. So no net gain. (Perhaps the read code would handle utf8
             # better than entity escapes, but cElementTree seems to do just fine
             # either way)
-            text = str(_unicode_re.sub(_unicode_escape_replace,
-                                       unicode_or_utf8_str)) + '"'
+            text = bytes(_unicode_re.sub(_unicode_escape_replace, unicode_or_utf8_str)) + b'"'
         else:
             # Plain strings are considered to already be in utf-8 so we do a
             # slightly different method for escaping.
             text = _utf8_re.sub(_utf8_escape_replace,
-                                unicode_or_utf8_str) + '"'
+                                unicode_or_utf8_str) + b'"'
         _map[unicode_or_utf8_str] = text
     return text
 
@@ -372,51 +372,51 @@
     root_path, root_ie = next(entries)
     for path, ie in entries:
         if ie.parent_id != root_id:
-            parent_str = ' parent_id="'
+            parent_str = b' parent_id="'
             parent_id  = encode_and_escape(ie.parent_id)
         else:
-            parent_str = ''
-            parent_id  = ''
+            parent_str = b''
+            parent_id  = b''
         if ie.kind == 'file':
             if ie.executable:
-                executable = ' executable="yes"'
+                executable = b' executable="yes"'
             else:
-                executable = ''
+                executable = b''
             if not working:
-                append('<file%s file_id="%s name="%s%s%s revision="%s '
-                    'text_sha1="%s" text_size="%d" />\n' % (
+                append(b'<file%s file_id="%s name="%s%s%s revision="%s '
+                    b'text_sha1="%s" text_size="%d" />\n' % (
                     executable, encode_and_escape(ie.file_id),
                     encode_and_escape(ie.name), parent_str, parent_id,
                     encode_and_escape(ie.revision), ie.text_sha1,
                     ie.text_size))
             else:
-                append('<file%s file_id="%s name="%s%s%s />\n' % (
+                append(b'<file%s file_id="%s name="%s%s%s />\n' % (
                     executable, encode_and_escape(ie.file_id),
                     encode_and_escape(ie.name), parent_str, parent_id))
         elif ie.kind == 'directory':
             if not working:
-                append('<directory file_id="%s name="%s%s%s revision="%s '
-                    '/>\n' % (
+                append(b'<directory file_id="%s name="%s%s%s revision="%s '
+                    b'/>\n' % (
                     encode_and_escape(ie.file_id),
                     encode_and_escape(ie.name),
                     parent_str, parent_id,
                     encode_and_escape(ie.revision)))
             else:
-                append('<directory file_id="%s name="%s%s%s />\n' % (
+                append(b'<directory file_id="%s name="%s%s%s />\n' % (
                     encode_and_escape(ie.file_id),
                     encode_and_escape(ie.name),
                     parent_str, parent_id))
         elif ie.kind == 'symlink':
             if not working:
-                append('<symlink file_id="%s name="%s%s%s revision="%s '
-                    'symlink_target="%s />\n' % (
+                append(b'<symlink file_id="%s name="%s%s%s revision="%s '
+                    b'symlink_target="%s />\n' % (
                     encode_and_escape(ie.file_id),
                     encode_and_escape(ie.name),
                     parent_str, parent_id,
                     encode_and_escape(ie.revision),
                     encode_and_escape(ie.symlink_target)))
             else:
-                append('<symlink file_id="%s name="%s%s%s />\n' % (
+                append(b'<symlink file_id="%s name="%s%s%s />\n' % (
                     encode_and_escape(ie.file_id),
                     encode_and_escape(ie.name),
                     parent_str, parent_id))
@@ -424,18 +424,18 @@
             if ie.kind not in supported_kinds:
                 raise errors.UnsupportedInventoryKind(ie.kind)
             if not working:
-                append('<tree-reference file_id="%s name="%s%s%s '
-                    'revision="%s reference_revision="%s />\n' % (
+                append(b'<tree-reference file_id="%s name="%s%s%s '
+                    b'revision="%s reference_revision="%s />\n' % (
                     encode_and_escape(ie.file_id),
                     encode_and_escape(ie.name),
                     parent_str, parent_id,
                     encode_and_escape(ie.revision),
                     encode_and_escape(ie.reference_revision)))
             else:
-                append('<tree-reference file_id="%s name="%s%s%s />\n' % (
+                append(b'<tree-reference file_id="%s name="%s%s%s />\n' % (
                     encode_and_escape(ie.file_id),
                     encode_and_escape(ie.name),
                     parent_str, parent_id))
         else:
             raise errors.UnsupportedInventoryKind(ie.kind)
-    append('</inventory>\n')
+    append(b'</inventory>\n')

=== modified file 'breezy/fetch.py'
--- breezy/fetch.py	2018-03-04 15:59:37 +0000
+++ breezy/fetch.py	2018-03-24 23:50:35 +0000
@@ -76,8 +76,8 @@
         self.find_ghosts = find_ghosts
         self.from_repository.lock_read()
         mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
-               self.from_repository, self.from_repository._format,
-               self.to_repository, self.to_repository._format)
+               str(self.from_repository), str(self.from_repository._format),
+               str(self.to_repository), str(self.to_repository._format))
         try:
             self.__fetch()
         finally:

=== modified file 'breezy/hashcache.py'
--- breezy/hashcache.py	2017-11-12 19:56:22 +0000
+++ breezy/hashcache.py	2018-03-24 23:50:35 +0000
@@ -255,7 +255,7 @@
         try:
             inf = open(fn, 'rb', buffering=65000)
         except IOError as e:
-            trace.mutter("failed to open %s: %s", fn, e)
+            trace.mutter("failed to open %s: %s", fn, str(e))
             # better write it now so it is valid
             self.needs_write = True
             return

=== modified file 'breezy/plugins/fastimport/branch_updater.py'
--- breezy/plugins/fastimport/branch_updater.py	2018-01-22 03:36:19 +0000
+++ breezy/plugins/fastimport/branch_updater.py	2018-03-24 23:50:35 +0000
@@ -122,7 +122,7 @@
                     br = self.make_branch(name, ref_name, dir_policy)
                     branch_tips.append((br, tip))
                     continue
-                except errors.BzrError, ex:
+                except errors.BzrError as ex:
                     show_error("ERROR: failed to create branch %s: %s",
                         name, ex)
             lost_head = self.cache_mgr.lookup_committish(tip)
@@ -146,7 +146,7 @@
             to_transport.create_prefix()
             try:
                 return controldir.ControlDir.open(location).open_branch()
-            except errors.NotBranchError, ex:
+            except errors.NotBranchError as ex:
                 return controldir.ControlDir.create_branch_convenience(
                     location,
                     format=self._branch_format,
@@ -154,7 +154,7 @@
         else:
             try:
                 return self.repo.controldir.open_branch(name)
-            except errors.NotBranchError, ex:
+            except errors.NotBranchError as ex:
                 return self.repo.controldir.create_branch(name)
 
 

=== modified file 'breezy/plugins/fastimport/bzr_commit_handler.py'
--- breezy/plugins/fastimport/bzr_commit_handler.py	2018-03-10 13:56:26 +0000
+++ breezy/plugins/fastimport/bzr_commit_handler.py	2018-03-24 23:50:35 +0000
@@ -380,9 +380,9 @@
             try:
                 self.record_new(path, ie)
             except:
-                print "failed to add path '%s' with entry '%s' in command %s" \
-                    % (path, ie, self.command.id)
-                print "parent's children are:\n%r\n" % (ie.parent_id.children,)
+                print("failed to add path '%s' with entry '%s' in command %s" \
+                    % (path, ie, self.command.id))
+                print("parent's children are:\n%r\n" % (ie.parent_id.children,))
                 raise
         else:
             if old_ie.kind == 'directory':

=== modified file 'breezy/plugins/fastimport/processors/generic_processor.py'
--- breezy/plugins/fastimport/processors/generic_processor.py	2018-01-22 02:23:22 +0000
+++ breezy/plugins/fastimport/processors/generic_processor.py	2018-03-24 23:50:35 +0000
@@ -534,7 +534,7 @@
         try:
             handler.process()
         except:
-            print "ABORT: exception occurred processing commit %s" % (cmd.id)
+            print("ABORT: exception occurred processing commit %s" % (cmd.id))
             raise
         self.cache_mgr.add_mark(mark, handler.revision_id)
         self._revision_count += 1

=== modified file 'breezy/plugins/weave_fmt/__init__.py'
--- breezy/plugins/weave_fmt/__init__.py	2017-06-14 22:34:05 +0000
+++ breezy/plugins/weave_fmt/__init__.py	2018-03-24 23:50:35 +0000
@@ -43,12 +43,12 @@
 # disk format string as a key for the network_name because they meet the
 # constraints (simple string, unique, immutable).
 _mod_repository.network_format_registry.register_lazy(
-    "Bazaar-NG branch, format 5\n",
+    b"Bazaar-NG branch, format 5\n",
     'breezy.plugins.weave_fmt.repository',
     'RepositoryFormat5',
 )
 _mod_repository.network_format_registry.register_lazy(
-    "Bazaar-NG branch, format 6\n",
+    b"Bazaar-NG branch, format 6\n",
     'breezy.plugins.weave_fmt.repository',
     'RepositoryFormat6',
 )
@@ -60,7 +60,7 @@
 # the repository is not separately opened are similar.
 
 _mod_repository.format_registry.register_lazy(
-    'Bazaar-NG Repository format 7',
+    b'Bazaar-NG Repository format 7',
     'breezy.plugins.weave_fmt.repository',
     'RepositoryFormat7'
     )
@@ -95,20 +95,20 @@
 
 
 BzrProber.formats.register_lazy(
-    "Bazaar-NG branch, format 0.0.4\n", "breezy.plugins.weave_fmt.bzrdir",
+    b"Bazaar-NG branch, format 0.0.4\n", "breezy.plugins.weave_fmt.bzrdir",
     "BzrDirFormat4")
 BzrProber.formats.register_lazy(
-    "Bazaar-NG branch, format 5\n", "breezy.plugins.weave_fmt.bzrdir",
+    b"Bazaar-NG branch, format 5\n", "breezy.plugins.weave_fmt.bzrdir",
     "BzrDirFormat5")
 BzrProber.formats.register_lazy(
-    "Bazaar-NG branch, format 6\n", "breezy.plugins.weave_fmt.bzrdir",
+    b"Bazaar-NG branch, format 6\n", "breezy.plugins.weave_fmt.bzrdir",
     "BzrDirFormat6")
 
 
 _mod_branch.format_registry.register_extra_lazy(
     'breezy.plugins.weave_fmt.branch', 'BzrBranchFormat4')
 _mod_branch.network_format_registry.register_lazy(
-    "Bazaar-NG branch, format 6\n",
+    b"Bazaar-NG branch, format 6\n",
     'breezy.plugins.weave_fmt.branch', "BzrBranchFormat4")
 
 

=== modified file 'breezy/plugins/weave_fmt/test_repository.py'
--- breezy/plugins/weave_fmt/test_repository.py	2017-11-12 20:44:54 +0000
+++ breezy/plugins/weave_fmt/test_repository.py	2018-03-24 23:50:35 +0000
@@ -280,14 +280,14 @@
                          InterRepository.get(repo_a, repo_b).__class__)
 
 
-_working_inventory_v4 = """<inventory file_id="TREE_ROOT">
+_working_inventory_v4 = b"""<inventory file_id="TREE_ROOT">
 <entry file_id="bar-20050901064931-73b4b1138abc9cd2" kind="file" name="bar" parent_id="TREE_ROOT" />
 <entry file_id="foo-20050801201819-4139aa4a272f4250" kind="directory" name="foo" parent_id="TREE_ROOT" />
 <entry file_id="bar-20050824000535-6bc48cfad47ed134" kind="file" name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" />
 </inventory>"""
 
 
-_revision_v4 = """<revision committer="Martin Pool &lt;[e-mail]&gt;"
+_revision_v4 = b"""<revision committer="Martin Pool &lt;[e-mail]&gt;"
     inventory_id="[e-mail]-20050905080035-e0439293f8b6b9f9"
     inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
     revision_id="[e-mail]-20050905080035-e0439293f8b6b9f9"

=== modified file 'breezy/plugins/weave_fmt/test_store.py'
--- breezy/plugins/weave_fmt/test_store.py	2017-06-11 20:33:20 +0000
+++ breezy/plugins/weave_fmt/test_store.py	2018-03-24 23:50:35 +0000
@@ -51,12 +51,12 @@
         store = self.get_store()
         self.fill_store(store)
 
-        self.check_content(store, 'a', 'hello')
-        self.check_content(store, 'b', 'other')
-        self.check_content(store, 'c', 'something')
+        self.check_content(store, 'a', b'hello')
+        self.check_content(store, 'b', b'other')
+        self.check_content(store, 'c', b'something')
 
         # Make sure that requesting a non-existing file fails
-        self.assertRaises(KeyError, self.check_content, store, 'd', None)
+        self.assertRaises(KeyError, self.check_content, store, b'd', None)
 
     def test_multiple_add(self):
         """Multiple add with same ID should raise a BzrError"""
@@ -95,10 +95,10 @@
         store = self.get_store()
         store.add(BytesIO(b'hello'), 'aa')
         self.assertNotEqual(store.get('aa'), None)
-        self.assertEqual(store.get('aa').read(), 'hello')
+        self.assertEqual(store.get('aa').read(), b'hello')
         store.add(BytesIO(b'hello world'), 'bb')
         self.assertNotEqual(store.get('bb'), None)
-        self.assertEqual(store.get('bb').read(), 'hello world')
+        self.assertEqual(store.get('bb').read(), b'hello world')
 
     def test_missing_is_absent(self):
         store = self.get_store()
@@ -324,22 +324,22 @@
 
     def test_get_simple(self):
         my_store = self.get_populated_store()
-        self.assertEqual('content', my_store.get('foo').read())
+        self.assertEqual(b'content', my_store.get('foo').read())
         my_store = self.get_populated_store(True)
-        self.assertEqual('content', my_store.get('foo').read())
+        self.assertEqual(b'content', my_store.get('foo').read())
 
     def test_get_suffixed(self):
         my_store = self.get_populated_store()
-        self.assertEqual('signature', my_store.get('foo', 'sig').read())
+        self.assertEqual(b'signature', my_store.get('foo', 'sig').read())
         my_store = self.get_populated_store(True)
-        self.assertEqual('signature', my_store.get('foo', 'sig').read())
+        self.assertEqual(b'signature', my_store.get('foo', 'sig').read())
 
     def test_get_suffixed_no_base(self):
         my_store = self.get_populated_store()
-        self.assertEqual('signature for missing base',
+        self.assertEqual(b'signature for missing base',
                          my_store.get('missing', 'sig').read())
         my_store = self.get_populated_store(True)
-        self.assertEqual('signature for missing base',
+        self.assertEqual(b'signature for missing base',
                          my_store.get('missing', 'sig').read())
 
     def test___iter__no_suffix(self):

=== modified file 'breezy/revision.py'
--- breezy/revision.py	2017-07-10 20:12:25 +0000
+++ breezy/revision.py	2018-03-24 23:50:35 +0000
@@ -32,8 +32,8 @@
     text_type,
     )
 
-NULL_REVISION=b"null:"
-CURRENT_REVISION=b"current:"
+NULL_REVISION = b"null:"
+CURRENT_REVISION = b"current:"
 
 
 class Revision(object):

=== modified file 'breezy/tests/per_intertree/test_compare.py'
--- breezy/tests/per_intertree/test_compare.py	2018-03-22 02:21:11 +0000
+++ breezy/tests/per_intertree/test_compare.py	2018-03-24 23:50:35 +0000
@@ -54,8 +54,8 @@
         files = ['a', 'b/', 'b/c']
         self.build_tree(files, line_endings='binary',
                         transport=tree.controldir.root_transport)
-        tree.set_root_id('root-id')
-        tree.add(files, ['a-id', 'b-id', 'c-id'])
+        tree.set_root_id(b'root-id')
+        tree.add(files, [b'a-id', b'b-id', b'c-id'])
 
     def get_tree_no_parents_abc_content(self, tree, converter=None):
         """return a test tree with a, b/, b/c contents."""
@@ -84,9 +84,9 @@
         tree2 = self.get_tree_no_parents_abc_content(tree2)
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
         d = self.intertree_class(tree1, tree2).compare()
-        self.assertEqual([('a', 'a-id', 'file'),
-                          ('b', 'b-id', 'directory'),
-                          ('b/c', 'c-id', 'file'),
+        self.assertEqual([('a', b'a-id', 'file'),
+                          ('b', b'b-id', 'directory'),
+                          ('b/c', b'c-id', 'file'),
                          ], d.added)
         self.assertEqual([], d.modified)
         self.assertEqual([], d.removed)
@@ -248,7 +248,7 @@
         d = self.intertree_class(tree1, tree2).compare(
             specific_files=['b/c'])
         self.assertEqual(
-            [(u'b', 'b-id', 'directory'), ('b/c', 'c-id', 'file')], d.added)
+            [(u'b', b'b-id', 'directory'), ('b/c', b'c-id', 'file')], d.added)
         self.assertEqual([], d.modified)
         self.assertEqual([], d.removed)
         self.assertEqual([], d.renamed)
@@ -263,7 +263,7 @@
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
         d = self.intertree_class(tree1, tree2).compare(specific_files=['b'])
         self.assertEqual(
-            [('b', 'b-id', 'directory'), ('b/c', 'c-id', 'file')],
+            [('b', b'b-id', 'directory'), ('b/c', b'c-id', 'file')],
             d.added)
         self.assertEqual([], d.modified)
         self.assertEqual([], d.removed)
@@ -281,9 +281,9 @@
         self.assertEqual([], d.added)
         self.assertEqual([], d.modified)
         self.assertEqual([], d.removed)
-        self.assertEqual([('a', 'd', 'a-id', 'file', True, False)], d.renamed)
+        self.assertEqual([('a', 'd', b'a-id', 'file', True, False)], d.renamed)
         self.assertEqual(
-            [(u'b', 'b-id', 'directory'), (u'b/c', 'c-id', 'file')],
+            [(u'b', b'b-id', 'directory'), (u'b/c', b'c-id', 'file')],
             d.unchanged)
 
     def test_extra_trees_finds_ids(self):
@@ -302,7 +302,7 @@
         tree3 = self.get_tree_no_parents_abc_content_6(tree3)
         tree3.lock_read()
         self.addCleanup(tree3.unlock)
-        # tree 3 has 'e' which is 'c-id'. Tree 1 has c-id at b/c, and Tree 2
+        # tree 3 has 'e' which is b'c-id'. Tree 1 has c-id at b/c, and Tree 2
         # has c-id at b/c with its exec flag toggled.
         # without extra_trees, we should get no modifications from this
         # so do one, to be sure the test is valid.
@@ -313,7 +313,7 @@
         d = self.intertree_class(tree1, tree2).compare(
             specific_files=['e'], extra_trees=[tree3])
         self.assertEqual([], d.added)
-        self.assertEqual([('b/c', 'c-id', 'file', False, True)], d.modified)
+        self.assertEqual([('b/c', b'c-id', 'file', False, True)], d.modified)
         self.assertEqual([], d.removed)
         self.assertEqual([], d.renamed)
         self.assertEqual([], d.unchanged)
@@ -339,14 +339,14 @@
         tree2.set_root_id(tree1.get_root_id())
         self.build_tree(['tree1/a', 'tree1/c',
                          'tree2/a', 'tree2/b', 'tree2/c'])
-        tree1.add(['a', 'c'], ['a-id', 'c-id'])
-        tree2.add(['a', 'c'], ['a-id', 'c-id'])
+        tree1.add(['a', 'c'], [b'a-id', b'c-id'])
+        tree2.add(['a', 'c'], [b'a-id', b'c-id'])
 
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
         d = self.intertree_class(tree1, tree2).compare()
         self.assertEqual([], d.added)
-        self.assertEqual([(u'a', 'a-id', 'file', True, False),
-            (u'c', 'c-id', 'file', True, False)], d.modified)
+        self.assertEqual([(u'a', b'a-id', 'file', True, False),
+            (u'c', b'c-id', 'file', True, False)], d.modified)
         self.assertEqual([], d.removed)
         self.assertEqual([], d.renamed)
         self.assertEqual([], d.unchanged)
@@ -386,7 +386,7 @@
         self.build_tree(files, line_endings='binary',
                         transport=tree.controldir.root_transport)
         tree.set_root_id('root-id')
-        tree.add(files, ['a-id', 'b-id', 'c-id'])
+        tree.add(files, [b'a-id', b'b-id', b'c-id'])
 
     def get_tree_no_parents_abc_content(self, tree, converter=None):
         """return a test tree with a, b/, b/c contents."""
@@ -396,11 +396,11 @@
     def get_tree_no_parents_abc_content_7(self, tree, converter=None):
         """return a test tree with a, b/, d/e contents.
 
-        This variation adds a dir 'd' ('d-id'), renames b to d/e.
+        This variation adds a dir 'd' (b'd-id'), renames b to d/e.
         """
         self._make_abc_tree(tree)
         self.build_tree(['d/'], transport=tree.controldir.root_transport)
-        tree.add(['d'], ['d-id'])
+        tree.add(['d'], [b'd-id'])
         tt = transform.TreeTransform(tree)
         trans_id = tt.trans_id_tree_path('b')
         parent_trans_id = tt.trans_id_tree_path('d')
@@ -496,7 +496,7 @@
         tree2 = self.make_to_branch_and_tree('tree2')
         tree2.set_root_id(tree1.get_root_id())
         paths, path_ids = self._create_special_names(tree2, 'tree2')
-        tree2.commit('initial', rev_id='rev-1')
+        tree2.commit('initial', rev_id=b'rev-1')
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         return (tree1, tree2, paths, path_ids)
 
@@ -534,8 +534,8 @@
             with_slashes.append(base_path + '/' + d + '/f')
             paths.append(d)
             paths.append(d+'/f')
-            path_ids.append(d.replace('/', '_') + '-id')
-            path_ids.append(d.replace('/', '_') + '_f-id')
+            path_ids.append((d.replace('/', '_') + '-id').encode('ascii'))
+            path_ids.append((d.replace('/', '_') + '_f-id').encode('ascii'))
         self.build_tree(with_slashes)
         tree.add(paths, path_ids)
         return paths, path_ids
@@ -630,11 +630,11 @@
         tree2 = self.get_tree_no_parents_abc_content(tree2)
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         expected_results = sorted([
-            self.added(tree2, 'root-id'),
-            self.added(tree2, 'a-id'),
-            self.added(tree2, 'b-id'),
-            self.added(tree2, 'c-id'),
-            self.deleted(tree1, 'empty-root-id')])
+            self.added(tree2, b'root-id'),
+            self.added(tree2, b'a-id'),
+            self.added(tree2, b'b-id'),
+            self.added(tree2, b'c-id'),
+            self.deleted(tree1, b'empty-root-id')])
         self.assertEqual(expected_results, self.do_iter_changes(tree1, tree2))
         self.check_has_changes(True, tree1, tree2)
 
@@ -654,11 +654,11 @@
         tree2 = self.get_tree_no_parents_abc_content(tree2)
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         expected_results = sorted([
-            self.added(tree2, 'root-id'),
-            self.added(tree2, 'a-id'),
-            self.added(tree2, 'b-id'),
-            self.added(tree2, 'c-id'),
-            self.deleted(tree1, 'empty-root-id')])
+            self.added(tree2, b'root-id'),
+            self.added(tree2, b'a-id'),
+            self.added(tree2, b'b-id'),
+            self.added(tree2, b'c-id'),
+            self.deleted(tree1, b'empty-root-id')])
         self.assertEqual(expected_results, self.do_iter_changes(tree1, tree2))
         self.check_has_changes(True, tree1, tree2)
 
@@ -669,9 +669,9 @@
         tree2 = self.get_tree_no_parents_abc_content(tree2)
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         self.assertEqual(
-            sorted([self.added(tree2, 'root-id'),
-             self.added(tree2, 'a-id'),
-             self.deleted(tree1, 'empty-root-id')]),
+            sorted([self.added(tree2, b'root-id'),
+             self.added(tree2, b'a-id'),
+             self.deleted(tree1, b'empty-root-id')]),
             self.do_iter_changes(tree1, tree2, specific_files=['a']))
 
     def test_abc_content_to_empty_a_only(self):
@@ -682,7 +682,7 @@
         tree2 = self.get_tree_no_parents_no_content(tree2)
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         self.assertEqual(
-            [self.deleted(tree1, 'a-id')],
+            [self.deleted(tree1, b'a-id')],
             self.do_iter_changes(tree1, tree2, specific_files=['a']))
 
     def test_abc_content_to_empty_b_only(self):
@@ -693,7 +693,7 @@
         tree2 = self.get_tree_no_parents_no_content(tree2)
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         self.assertEqual(
-            [self.deleted(tree1, 'b-id'), self.deleted(tree1, 'c-id')],
+            [self.deleted(tree1, b'b-id'), self.deleted(tree1, b'c-id')],
             self.do_iter_changes(tree1, tree2, specific_files=['b']))
 
     def test_empty_to_abc_content_a_and_c_only(self):
@@ -702,9 +702,9 @@
         tree1 = self.get_tree_no_parents_no_content(tree1)
         tree2 = self.get_tree_no_parents_abc_content(tree2)
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
-        expected_result = sorted([self.added(tree2, 'root-id'),
-            self.added(tree2, 'a-id'), self.added(tree2, 'b-id'),
-            self.added(tree2, 'c-id'), self.deleted(tree1, 'empty-root-id')])
+        expected_result = sorted([self.added(tree2, b'root-id'),
+            self.added(tree2, b'a-id'), self.added(tree2, b'b-id'),
+            self.added(tree2, b'c-id'), self.deleted(tree1, 'empty-root-id')])
         self.assertEqual(expected_result,
             self.do_iter_changes(tree1, tree2, specific_files=['a', 'b/c']))
 
@@ -715,9 +715,9 @@
         tree2 = self.get_tree_no_parents_no_content(tree2)
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         expected_results = sorted([
-            self.added(tree2, 'empty-root-id'),
-            self.deleted(tree1, 'root-id'), self.deleted(tree1, 'a-id'),
-            self.deleted(tree1, 'b-id'), self.deleted(tree1, 'c-id')])
+            self.added(tree2, b'empty-root-id'),
+            self.deleted(tree1, b'root-id'), self.deleted(tree1, b'a-id'),
+            self.deleted(tree1, b'b-id'), self.deleted(tree1, b'c-id')])
         self.assertEqual(
             expected_results,
             self.do_iter_changes(tree1, tree2))
@@ -730,7 +730,7 @@
         tree2 = self.get_tree_no_parents_abc_content_2(tree2)
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
         root_id = tree1.path2id('')
-        self.assertEqual([('a-id', ('a', 'a'), True, (True, True),
+        self.assertEqual([(b'a-id', ('a', 'a'), True, (True, True),
                            (root_id, root_id), ('a', 'a'),
                            ('file', 'file'), (False, False))],
                          self.do_iter_changes(tree1, tree2))
@@ -742,8 +742,8 @@
         tree1 = self.get_tree_no_parents_abc_content(tree1)
         tree2 = self.get_tree_no_parents_abc_content_3(tree2)
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
-        self.assertEqual([('c-id', ('b/c', 'b/c'), False, (True, True),
-                           ('b-id', 'b-id'), ('c', 'c'), ('file', 'file'),
+        self.assertEqual([(b'c-id', ('b/c', 'b/c'), False, (True, True),
+                           (b'b-id', b'b-id'), ('c', 'c'), ('file', 'file'),
                           (False, True))],
                          self.do_iter_changes(tree1, tree2))
 
@@ -780,7 +780,7 @@
         tree2 = self.get_tree_no_parents_abc_content_5(tree2)
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
         root_id = tree1.path2id('')
-        self.assertEqual([('a-id', ('a', 'd'), True, (True, True),
+        self.assertEqual([(b'a-id', ('a', 'd'), True, (True, True),
                            (root_id, root_id), ('a', 'd'), ('file', 'file'),
                            (False, False))],
                          self.do_iter_changes(tree1, tree2))
@@ -850,8 +850,8 @@
         # d(d-id) is new, e is b-id renamed. 
         root_id = tree1.path2id('')
         self.assertEqualIterChanges(
-            [self.renamed(tree1, tree2, 'b-id', False),
-             self.added(tree2, 'd-id')],
+            [self.renamed(tree1, tree2, b'b-id', False),
+             self.added(tree2, b'd-id')],
              self.do_iter_changes(tree1, tree2, specific_files=['d/e']))
 
     def test_specific_with_rename_under_dir_under_new_dir_reports_new_dir(self):
@@ -865,27 +865,27 @@
         root_id = tree1.path2id('')
         self.assertEqualIterChanges(
             [self.renamed(tree1, tree2, tree1.path2id('b'), False),
-             self.added(tree2, 'd-id'),
-             self.renamed(tree1, tree2, 'a-id', False)],
+             self.added(tree2, b'd-id'),
+             self.renamed(tree1, tree2, b'a-id', False)],
              self.do_iter_changes(tree1, tree2, specific_files=['d/e/a']))
 
     def test_specific_old_parent_same_path_new_parent(self):
         # when a parent is new at its path, if the path was used in the source
         # it must be emitted as a change.
         tree1 = self.make_branch_and_tree('1')
-        tree1.add(['a'], ['a-id'], ['file'])
+        tree1.add(['a'], [b'a-id'], ['file'])
         tree1.put_file_bytes_non_atomic('a', 'a file')
         tree2 = self.make_to_branch_and_tree('2')
         tree2.set_root_id(tree1.get_root_id())
-        tree2.mkdir('a', 'b-id')
-        tree2.add(['a/c'], ['c-id'], ['file'])
+        tree2.mkdir('a', b'b-id')
+        tree2.add(['a/c'], [b'c-id'], ['file'])
         tree2.put_file_bytes_non_atomic('a/c', 'another file')
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         # a-id is gone, b-id and c-id are added.
         self.assertEqualIterChanges(
-            [self.deleted(tree1, 'a-id'),
-             self.added(tree2, 'b-id'),
-             self.added(tree2, 'c-id')],
+            [self.deleted(tree1, b'a-id'),
+             self.added(tree2, b'b-id'),
+             self.added(tree2, b'c-id')],
              self.do_iter_changes(tree1, tree2, specific_files=['a/c']))
 
     def test_specific_old_parent_becomes_file(self):
@@ -997,8 +997,8 @@
         tree2 = self.get_tree_no_parents_abc_content_6(tree2)
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
         root_id = tree1.path2id('')
-        self.assertEqual([('c-id', ('b/c', 'e'), False, (True, True),
-                           ('b-id', root_id), ('c', 'e'), ('file', 'file'),
+        self.assertEqual([(b'c-id', ('b/c', 'e'), False, (True, True),
+                           (b'b-id', root_id), ('c', 'e'), ('file', 'file'),
                            (False, True))],
                          self.do_iter_changes(tree1, tree2))
 
@@ -1021,10 +1021,10 @@
         tree1 = self.make_branch_and_tree('1')
         self.build_tree(['1/a'])
         tree1.set_root_id('root-id')
-        tree1.add(['a'], ['a-id'])
+        tree1.add(['a'], [b'a-id'])
         tree2 = self.make_branch_and_tree('2')
         os.mkfifo('2/a')
-        tree2.add(['a'], ['a-id'], ['file'])
+        tree2.add(['a'], [b'a-id'], ['file'])
         try:
             tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
         except (KeyError,):
@@ -1048,9 +1048,9 @@
         self.not_applicable_if_missing_in('a', tree2)
         self.not_applicable_if_missing_in('b', tree2)
         expected = sorted([
-            self.missing('a-id', 'a', 'a', 'root-id', 'file'),
-            self.missing('b-id', 'b', 'b', 'root-id', 'directory'),
-            self.missing('c-id', 'b/c', 'b/c', 'b-id', 'file'),
+            self.missing(b'a-id', 'a', 'a', b'root-id', 'file'),
+            self.missing(b'b-id', 'b', 'b', b'root-id', 'directory'),
+            self.missing(b'c-id', 'b/c', 'b/c', b'b-id', 'file'),
             ])
         self.assertEqual(expected, self.do_iter_changes(tree1, tree2))
 
@@ -1131,34 +1131,34 @@
         tree2 = self.get_tree_no_parents_abc_content_5(tree2)
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         self.assertEqual(sorted([self.unchanged(tree1, 'root-id'),
-            self.unchanged(tree1, 'b-id'),
-            ('a-id', ('a', 'd'), True, (True, True),
-             ('root-id', 'root-id'), ('a', 'd'), ('file', 'file'),
-            (False, False)), self.unchanged(tree1, 'c-id')]),
+            self.unchanged(tree1, b'b-id'),
+            (b'a-id', ('a', 'd'), True, (True, True),
+             (b'root-id', b'root-id'), ('a', 'd'), ('file', 'file'),
+            (False, False)), self.unchanged(tree1, b'c-id')]),
             self.do_iter_changes(tree1, tree2, include_unchanged=True))
 
     def test_compare_subtrees(self):
         tree1 = self.make_branch_and_tree('1')
         if not tree1.supports_tree_reference():
             return
-        tree1.set_root_id('root-id')
+        tree1.set_root_id(b'root-id')
         subtree1 = self.make_branch_and_tree('1/sub')
-        subtree1.set_root_id('subtree-id')
+        subtree1.set_root_id(b'subtree-id')
         tree1.add_reference(subtree1)
 
         tree2 = self.make_to_branch_and_tree('2')
         if not tree2.supports_tree_reference():
             return
-        tree2.set_root_id('root-id')
+        tree2.set_root_id(b'root-id')
         subtree2 = self.make_to_branch_and_tree('2/sub')
-        subtree2.set_root_id('subtree-id')
+        subtree2.set_root_id(b'subtree-id')
         tree2.add_reference(subtree2)
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
 
         self.assertEqual([], list(tree2.iter_changes(tree1)))
-        subtree1.commit('commit', rev_id='commit-a')
+        subtree1.commit('commit', rev_id=b'commit-a')
         self.assertEqual([
-            ('root-id',
+            (b'root-id',
              (u'', u''),
              False,
              (True, True),
@@ -1166,11 +1166,11 @@
              (u'', u''),
              ('directory', 'directory'),
              (False, False)),
-            ('subtree-id',
+            (b'subtree-id',
              ('sub', 'sub',),
              False,
              (True, True),
-             ('root-id', 'root-id'),
+             (b'root-id', b'root-id'),
              ('sub', 'sub'),
              ('tree-reference', 'tree-reference'),
              (False, False))],
@@ -1210,16 +1210,16 @@
         tree2.set_root_id(tree1.get_root_id())
         self.build_tree(['tree1/a', 'tree1/c',
                          'tree2/a', 'tree2/b', 'tree2/c'])
-        tree1.add(['a', 'c'], ['a-id', 'c-id'])
-        tree2.add(['a', 'c'], ['a-id', 'c-id'])
+        tree1.add(['a', 'c'], [b'a-id', b'c-id'])
+        tree2.add(['a', 'c'], [b'a-id', b'c-id'])
 
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
 
         # We should ignore the fact that 'b' exists in tree-2
         # because the want_unversioned parameter was not given.
         expected = sorted([
-            self.content_changed(tree2, 'a-id'),
-            self.content_changed(tree2, 'c-id'),
+            self.content_changed(tree2, b'a-id'),
+            self.content_changed(tree2, b'c-id'),
             ])
         self.assertEqual(expected, self.do_iter_changes(tree1, tree2))
         self.check_has_changes(True, tree1, tree2)
@@ -1808,21 +1808,21 @@
             ('tree2/b', 'b contents\n'),
             ('tree2/c', 'c contents\n'),
             ])
-        tree1.add(['a', 'b', 'c'], ['a-id', 'b-id', 'c-id'])
-        tree2.add(['a', 'c'], ['a-id', 'c-id'])
+        tree1.add(['a', 'b', 'c'], [b'a-id', b'b-id', b'c-id'])
+        tree2.add(['a', 'c'], [b'a-id', b'c-id'])
 
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         self.not_applicable_if_cannot_represent_unversioned(tree2)
 
         expected = sorted([
-            self.deleted(tree1, 'b-id'),
+            self.deleted(tree1, b'b-id'),
             self.unversioned(tree2, 'b'),
             ])
         self.assertEqual(expected,
                          self.do_iter_changes(tree1, tree2,
                                               want_unversioned=True))
         expected = sorted([
-            self.deleted(tree1, 'b-id'),
+            self.deleted(tree1, b'b-id'),
             ])
         self.assertEqual(expected,
                          self.do_iter_changes(tree1, tree2,
@@ -1842,23 +1842,23 @@
         # bzr add b c
 
         self.build_tree_contents([
-            ('tree1/b', 'b contents\n'),
-            ('tree1/c', 'c contents\n'),
-            ('tree2/a', 'b contents\n'),
-            ('tree2/b', 'new b contents\n'),
-            ('tree2/c', 'new c contents\n'),
-            ('tree2/d', 'c contents\n'),
+            ('tree1/b', b'b contents\n'),
+            ('tree1/c', b'c contents\n'),
+            ('tree2/a', b'b contents\n'),
+            ('tree2/b', b'new b contents\n'),
+            ('tree2/c', b'new c contents\n'),
+            ('tree2/d', b'c contents\n'),
             ])
-        tree1.add(['b', 'c'], ['b1-id', 'c1-id'])
-        tree2.add(['a', 'b', 'c', 'd'], ['b1-id', 'b2-id', 'c2-id', 'c1-id'])
+        tree1.add(['b', 'c'], [b'b1-id', b'c1-id'])
+        tree2.add(['a', 'b', 'c', 'd'], [b'b1-id', b'b2-id', b'c2-id', b'c1-id'])
 
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
 
         expected = sorted([
-            self.renamed(tree1, tree2, 'b1-id', False),
-            self.renamed(tree1, tree2, 'c1-id', False),
-            self.added(tree2, 'b2-id'),
-            self.added(tree2, 'c2-id'),
+            self.renamed(tree1, tree2, b'b1-id', False),
+            self.renamed(tree1, tree2, b'c1-id', False),
+            self.added(tree2, b'b2-id'),
+            self.added(tree2, b'c2-id'),
             ])
         self.assertEqual(expected,
                          self.do_iter_changes(tree1, tree2,
@@ -1876,13 +1876,13 @@
         # mv a a2
 
         self.build_tree_contents([
-            ('tree1/a', 'a contents\n'),
-            ('tree1/b', 'b contents\n'),
-            ('tree2/a', 'a contents\n'),
-            ('tree2/b', 'b contents\n'),
+            ('tree1/a', b'a contents\n'),
+            ('tree1/b', b'b contents\n'),
+            ('tree2/a', b'a contents\n'),
+            ('tree2/b', b'b contents\n'),
             ])
-        tree1.add(['a', 'b'], ['a-id', 'b-id'])
-        tree2.add(['a', 'b'], ['a-id', 'b-id'])
+        tree1.add(['a', 'b'], [b'a-id', b'b-id'])
+        tree2.add(['a', 'b'], [b'a-id', b'b-id'])
         os.rename('tree2/a', 'tree2/a2')
 
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)

=== modified file 'breezy/tests/per_merger.py'
--- breezy/tests/per_merger.py	2017-11-19 18:35:20 +0000
+++ breezy/tests/per_merger.py	2018-03-24 23:50:35 +0000
@@ -300,14 +300,14 @@
         return builder
 
     def create_file_needing_contents_merge(self, builder, file_id):
-        builder.add_file(file_id, builder.tree_root, "name1", "text1", True)
+        builder.add_file(file_id, builder.tree_root, "name1", b"text1", True)
         builder.change_contents(file_id, other="text4", this="text3")
 
     def test_change_vs_change(self):
         """Hook is used for (changed, changed)"""
         self.install_hook_success()
         builder = self.make_merge_builder()
-        builder.add_file("1", builder.tree_root, "name1", "text1", True)
+        builder.add_file("1", builder.tree_root, "name1", b"text1", True)
         builder.change_contents("1", other="text4", this="text3")
         conflicts = builder.merge(self.merge_type)
         self.assertEqual(conflicts, [])
@@ -318,7 +318,7 @@
         """Hook is used for (changed, deleted)"""
         self.install_hook_success()
         builder = self.make_merge_builder()
-        builder.add_file("1", builder.tree_root, "name1", "text1", True)
+        builder.add_file("1", builder.tree_root, "name1", b"text1", True)
         builder.change_contents("1", this="text2")
         builder.remove_file("1", other=True)
         conflicts = builder.merge(self.merge_type)
@@ -355,7 +355,7 @@
         """
         self.install_hook_log_lines()
         builder = self.make_merge_builder()
-        builder.add_file("1", builder.tree_root, "name1", "text1", True)
+        builder.add_file("1", builder.tree_root, "name1", b"text1", True)
         builder.change_contents("1", this="text2", other="text3")
         conflicts = builder.merge(self.merge_type)
         self.assertEqual(

=== modified file 'breezy/tests/per_repository_reference/test_fetch.py'
--- breezy/tests/per_repository_reference/test_fetch.py	2017-11-16 00:39:04 +0000
+++ breezy/tests/per_repository_reference/test_fetch.py	2018-03-24 23:50:35 +0000
@@ -35,17 +35,17 @@
                   ]
         builder.start_series()
         builder.build_snapshot(None, [
-            ('add', ('', 'root-id', 'directory', None)),
-            ('add', ('a', 'a-id', 'file', ''.join(content))),
-            ], revision_id='A-id')
+            ('add', ('', b'root-id', 'directory', None)),
+            ('add', ('a', b'a-id', 'file', ''.join(content))),
+            ], revision_id=b'A-id')
         content.append('and some more lines for B\n')
-        builder.build_snapshot(['A-id'], [
-            ('modify', ('a-id', ''.join(content)))],
-            revision_id='B-id')
+        builder.build_snapshot([b'A-id'], [
+            ('modify', (b'a-id', ''.join(content)))],
+            revision_id=b'B-id')
         content.append('and yet even more content for C\n')
-        builder.build_snapshot(['B-id'], [
-            ('modify', ('a-id', ''.join(content)))],
-            revision_id='C-id')
+        builder.build_snapshot([b'B-id'], [
+            ('modify', (b'a-id', ''.join(content)))],
+            revision_id=b'C-id')
         builder.finish_series()
         source_b = builder.get_branch()
         source_b.lock_read()

=== modified file 'breezy/tests/per_tree/__init__.py'
--- breezy/tests/per_tree/__init__.py	2018-03-24 13:28:54 +0000
+++ breezy/tests/per_tree/__init__.py	2018-03-24 23:50:35 +0000
@@ -136,7 +136,7 @@
             modify.
         """
         if empty_tree.supports_setting_file_ids():
-            empty_tree.set_root_id('empty-root-id')
+            empty_tree.set_root_id(b'empty-root-id')
         return self._convert_tree(empty_tree, converter)
 
     def _make_abc_tree(self, tree):

=== modified file 'breezy/tests/per_tree/test_tree.py'
--- breezy/tests/per_tree/test_tree.py	2018-03-24 10:24:48 +0000
+++ breezy/tests/per_tree/test_tree.py	2018-03-24 23:50:35 +0000
@@ -49,18 +49,18 @@
 
     def test_plan_file_merge(self):
         work_a = self.make_branch_and_tree('wta')
-        self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
+        self.build_tree_contents([('wta/file', b'a\nb\nc\nd\n')])
         work_a.add('file')
         file_id = work_a.path2id('file')
         work_a.commit('base version')
         work_b = work_a.controldir.sprout('wtb').open_workingtree()
-        self.build_tree_contents([('wta/file', 'b\nc\nd\ne\n')])
+        self.build_tree_contents([('wta/file', b'b\nc\nd\ne\n')])
         tree_a = self.workingtree_to_test_tree(work_a)
         if getattr(tree_a, 'plan_file_merge', None) is None:
             raise tests.TestNotApplicable('Tree does not support plan_file_merge')
         tree_a.lock_read()
         self.addCleanup(tree_a.unlock)
-        self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
+        self.build_tree_contents([('wtb/file', b'a\nc\nd\nf\n')])
         tree_b = self.workingtree_to_test_tree(work_b)
         tree_b.lock_read()
         self.addCleanup(tree_b.unlock)
@@ -86,8 +86,8 @@
         try:
             self.skip_if_no_reference(work_tree)
             subtree = self.make_branch_and_tree('wt/subtree')
-            subtree.set_root_id('sub-root')
-            subtree.commit('foo', rev_id='sub-1')
+            subtree.set_root_id(b'sub-root')
+            subtree.commit('foo', rev_id=b'sub-1')
             work_tree.add_reference(subtree)
         finally:
             work_tree.unlock()
@@ -99,8 +99,8 @@
         tree = self.create_nested()
         tree.lock_read()
         self.addCleanup(tree.unlock)
-        path = tree.id2path('sub-root')
-        self.assertEqual('sub-1',
+        path = tree.id2path(b'sub-root')
+        self.assertEqual(b'sub-1',
             tree.get_reference_revision(path, 'sub-root'))
 
     def test_iter_references(self):
@@ -211,7 +211,7 @@
 
     def test_get_file_lines_multi_line_breaks(self):
         work_tree = self.make_branch_and_tree('wt')
-        self.build_tree_contents([('wt/foobar', 'a\rb\nc\r\nd')])
+        self.build_tree_contents([('wt/foobar', b'a\rb\nc\r\nd')])
         work_tree.add('foobar')
         tree = self._convert_tree(work_tree)
         tree.lock_read()
@@ -224,9 +224,9 @@
 
     def test_iter_files_bytes(self):
         work_tree = self.make_branch_and_tree('wt')
-        self.build_tree_contents([('wt/foo', 'foo'),
-                                  ('wt/bar', 'bar'),
-                                  ('wt/baz', 'baz')])
+        self.build_tree_contents([('wt/foo', b'foo'),
+                                  ('wt/bar', b'bar'),
+                                  ('wt/baz', b'baz')])
         work_tree.add(['foo', 'bar', 'baz'])
         tree = self._convert_tree(work_tree)
         tree.lock_read()
@@ -325,7 +325,7 @@
 
     def test_get_file_sha1(self):
         work_tree = self.make_branch_and_tree('tree')
-        self.build_tree_contents([('tree/file', 'file content')])
+        self.build_tree_contents([('tree/file', b'file content')])
         work_tree.add('file')
         tree = self._convert_tree(work_tree)
         tree.lock_read()
@@ -339,8 +339,8 @@
     def test_get_file_verifier(self):
         work_tree = self.make_branch_and_tree('tree')
         self.build_tree_contents([
-            ('tree/file1', 'file content'),
-            ('tree/file2', 'file content')])
+            ('tree/file1', b'file content'),
+            ('tree/file2', b'file content')])
         work_tree.add(['file1', 'file2'])
         tree = self._convert_tree(work_tree)
         tree.lock_read()

=== modified file 'breezy/tests/test_bundle.py'
--- breezy/tests/test_bundle.py	2018-03-20 00:30:39 +0000
+++ breezy/tests/test_bundle.py	2018-03-24 23:50:35 +0000
@@ -611,7 +611,7 @@
         self.tree1 = self.make_branch_and_tree('b1')
         self.b1 = self.tree1.branch
 
-        self.build_tree_contents([('b1/one', 'one\n')])
+        self.build_tree_contents([('b1/one', b'one\n')])
         self.tree1.add('one', 'one-id')
         self.tree1.set_root_id('root-id')
         self.tree1.commit('add one', rev_id='a@cset-0-1')
@@ -630,8 +630,8 @@
                 , 'b1/sub/sub/'
                 , 'b1/sub/sub/nonempty.txt'
                 ])
-        self.build_tree_contents([('b1/sub/sub/emptyfile.txt', ''),
-                                  ('b1/dir/nolastnewline.txt', 'bloop')])
+        self.build_tree_contents([('b1/sub/sub/emptyfile.txt', b''),
+                                  ('b1/dir/nolastnewline.txt', b'bloop')])
         tt = TreeTransform(self.tree1)
         tt.new_file('executable', tt.root, '#!/bin/sh\n', 'exe-1', True)
         tt.apply()
@@ -1055,13 +1055,13 @@
     def test_bundle_with_ghosts(self):
         tree = self.make_branch_and_tree('tree')
         self.b1 = tree.branch
-        self.build_tree_contents([('tree/file', 'content1')])
+        self.build_tree_contents([('tree/file', b'content1')])
         tree.add(['file'])
         tree.commit('rev1')
-        self.build_tree_contents([('tree/file', 'content2')])
-        tree.add_parent_tree_id('ghost')
-        tree.commit('rev2', rev_id='rev2')
-        bundle = self.get_valid_bundle('null:', 'rev2')
+        self.build_tree_contents([('tree/file', b'content2')])
+        tree.add_parent_tree_id(b'ghost')
+        tree.commit('rev2', rev_id=b'rev2')
+        bundle = self.get_valid_bundle(b'null:', b'rev2')
 
     def make_simple_tree(self, format=None):
         tree = self.make_branch_and_tree('b1', format=format)

=== modified file 'breezy/tests/test_delta.py'
--- breezy/tests/test_delta.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/test_delta.py	2018-03-24 23:50:35 +0000
@@ -235,12 +235,12 @@
         """Doing a status when a file has changed kind should work"""
         tree = self.make_branch_and_tree('.')
         self.build_tree(['filename'])
-        tree.add('filename', 'file-id')
+        tree.add('filename', b'file-id')
         tree.commit('added filename')
         os.unlink('filename')
         self.build_tree(['filename/'])
         delta = tree.changes_from(tree.basis_tree())
-        self.assertEqual([('filename', 'file-id', 'file', 'directory')],
+        self.assertEqual([('filename', b'file-id', 'file', 'directory')],
                          delta.kind_changed)
         self.assertEqual([], delta.added)
         self.assertEqual([], delta.removed)
@@ -248,15 +248,15 @@
         self.assertEqual([], delta.modified)
         self.assertEqual([], delta.unchanged)
         self.assertTrue(delta.has_changed())
-        self.assertTrue(delta.touches_file_id('file-id'))
+        self.assertTrue(delta.touches_file_id(b'file-id'))
         self.assertEqual('kind changed:\n  filename (file => directory)\n',
                          self.show_string(delta))
         other_delta = _mod_delta.TreeDelta()
         self.assertNotEqual(other_delta, delta)
-        other_delta.kind_changed = [('filename', 'file-id', 'file',
+        other_delta.kind_changed = [('filename', b'file-id', 'file',
                                      'symlink')]
         self.assertNotEqual(other_delta, delta)
-        other_delta.kind_changed = [('filename', 'file-id', 'file',
+        other_delta.kind_changed = [('filename', b'file-id', 'file',
                                      'directory')]
         self.assertEqual(other_delta, delta)
         self.assertEqualDiff("TreeDelta(added=[], removed=[], renamed=[],"
@@ -271,10 +271,10 @@
         self.assertEqual([], delta.kind_changed)
         # This loses the fact that kind changed, remembering it as a
         # modification
-        self.assertEqual([('filename', 'dirname', 'file-id', 'directory',
+        self.assertEqual([('filename', 'dirname', b'file-id', 'directory',
                            True, False)], delta.renamed)
         self.assertTrue(delta.has_changed())
-        self.assertTrue(delta.touches_file_id('file-id'))
+        self.assertTrue(delta.touches_file_id(b'file-id'))
 
 
 class TestDeltaShow(tests.TestCaseWithTransport):

=== modified file 'breezy/tests/test_export_pot.py'
--- breezy/tests/test_export_pot.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_export_pot.py	2018-03-24 23:50:35 +0000
@@ -247,7 +247,7 @@
 
     def test_option_hidden(self):
         opt = option.Option("hidden", help="Unseen.", hidden=True)
-        self.assertEqual("", self.pot_from_option(opt))
+        self.assertEqual(b"", self.pot_from_option(opt))
 
     def test_option_context_missing(self):
         context = export_pot._ModuleContext("remote.py", 3)

=== modified file 'breezy/tests/test_http.py'
--- breezy/tests/test_http.py	2018-02-03 13:31:24 +0000
+++ breezy/tests/test_http.py	2018-03-24 23:50:35 +0000
@@ -735,7 +735,7 @@
 
     def setUp(self):
         super(TestRangeRequestServer, self).setUp()
-        self.build_tree_contents([('a', '0123456789')],)
+        self.build_tree_contents([('a', b'0123456789')],)
 
     def test_readv(self):
         t = self.get_readonly_transport()
@@ -962,7 +962,7 @@
 
     def setUp(self):
         super(TestTruncatedMultipleRangeServer, self).setUp()
-        self.build_tree_contents([('a', '0123456789')],)
+        self.build_tree_contents([('a', b'0123456789')],)
 
     def test_readv_with_short_reads(self):
         server = self.get_readonly_server()
@@ -1036,7 +1036,7 @@
 
     def setUp(self):
         super(TestTruncatedBeforeBoundary, self).setUp()
-        self.build_tree_contents([('a', '0123456789')],)
+        self.build_tree_contents([('a', b'0123456789')],)
 
     def test_readv_with_short_reads(self):
         server = self.get_readonly_server()
@@ -1095,8 +1095,8 @@
         super(TestLimitedRangeRequestServer, self).setUp()
         # We need to manipulate ranges that correspond to real chunks in the
         # response, so we build a content appropriately.
-        filler = ''.join(['abcdefghij' for x in range(102)])
-        content = ''.join(['%04d' % v + filler for v in range(16)])
+        filler = b''.join([b'abcdefghij' for x in range(102)])
+        content = b''.join([b'%04d' % v + filler for v in range(16)])
         self.build_tree_contents([('a', content)],)
 
     def test_few_ranges(self):
@@ -1192,8 +1192,8 @@
     def setUp(self):
         super(TestProxyHttpServer, self).setUp()
         self.transport_secondary_server = http_utils.ProxyServer
-        self.build_tree_contents([('foo', 'contents of foo\n'),
-                                  ('foo-proxied', 'proxied contents of foo\n')])
+        self.build_tree_contents([('foo', b'contents of foo\n'),
+                                  ('foo-proxied', b'proxied contents of foo\n')])
         # Let's setup some attributes for tests
         server = self.get_readonly_server()
         self.server_host_port = '%s:%d' % (server.host, server.port)
@@ -1260,7 +1260,7 @@
 
     def setUp(self):
         super(TestRanges, self).setUp()
-        self.build_tree_contents([('a', '0123456789')],)
+        self.build_tree_contents([('a', b'0123456789')],)
 
     def create_transport_readonly_server(self):
         return http_server.HttpServer(protocol_version=self._protocol_version)
@@ -1310,9 +1310,9 @@
 
     def setUp(self):
         super(TestHTTPRedirections, self).setUp()
-        self.build_tree_contents([('a', '0123456789'),
+        self.build_tree_contents([('a', b'0123456789'),
                                   ('bundle',
-                                  '# Bazaar revision bundle v0.9\n#\n')
+                                  b'# Bazaar revision bundle v0.9\n#\n')
                                   ],)
 
     def test_redirected(self):
@@ -1380,17 +1380,17 @@
         super(TestHTTPSilentRedirections, self).setUp()
         install_redirected_request(self)
         cleanup_http_redirection_connections(self)
-        self.build_tree_contents([('a', 'a'),
+        self.build_tree_contents([('a', b'a'),
                                   ('1/',),
-                                  ('1/a', 'redirected once'),
+                                  ('1/a', b'redirected once'),
                                   ('2/',),
-                                  ('2/a', 'redirected twice'),
+                                  ('2/a', b'redirected twice'),
                                   ('3/',),
-                                  ('3/a', 'redirected thrice'),
+                                  ('3/a', b'redirected thrice'),
                                   ('4/',),
-                                  ('4/a', 'redirected 4 times'),
+                                  ('4/a', b'redirected 4 times'),
                                   ('5/',),
-                                  ('5/a', 'redirected 5 times'),
+                                  ('5/a', b'redirected 5 times'),
                                   ],)
 
     def test_one_redirection(self):
@@ -1429,7 +1429,7 @@
 
     def setUp(self):
         super(TestDoCatchRedirections, self).setUp()
-        self.build_tree_contents([('a', '0123456789'),],)
+        self.build_tree_contents([('a', b'0123456789'),],)
         cleanup_http_redirection_connections(self)
 
         self.old_transport = self.get_old_transport()
@@ -1512,8 +1512,8 @@
     def setUp(self):
         super(TestAuth, self).setUp()
         self.server = self.get_readonly_server()
-        self.build_tree_contents([('a', 'contents of a\n'),
-                                  ('b', 'contents of b\n'),])
+        self.build_tree_contents([('a', b'contents of a\n'),
+                                  ('b', b'contents of b\n'),])
 
     def create_transport_readonly_server(self):
         server = self._auth_server(protocol_version=self._protocol_version)
@@ -1713,10 +1713,10 @@
     def setUp(self):
         super(TestProxyAuth, self).setUp()
         # Override the contents to avoid false positives
-        self.build_tree_contents([('a', 'not proxied contents of a\n'),
-                                  ('b', 'not proxied contents of b\n'),
-                                  ('a-proxied', 'contents of a\n'),
-                                  ('b-proxied', 'contents of b\n'),
+        self.build_tree_contents([('a', b'not proxied contents of a\n'),
+                                  ('b', b'not proxied contents of b\n'),
+                                  ('a-proxied', b'contents of a\n'),
+                                  ('b-proxied', b'contents of b\n'),
                                   ])
 
     def get_user_transport(self, user, password):
@@ -2163,9 +2163,9 @@
 
     def setUp(self):
         super(TestAuthOnRedirected, self).setUp()
-        self.build_tree_contents([('a', 'a'),
+        self.build_tree_contents([('a', b'a'),
                                   ('1/',),
-                                  ('1/a', 'redirected once'),
+                                  ('1/a', b'redirected once'),
                                   ],)
         new_prefix = 'http://%s:%s' % (self.new_server.host,
                                        self.new_server.port)

=== modified file 'breezy/tests/test_merge_directive.py'
--- breezy/tests/test_merge_directive.py	2017-10-27 00:18:42 +0000
+++ breezy/tests/test_merge_directive.py	2018-03-24 23:50:35 +0000
@@ -355,42 +355,42 @@
         tree_a = self.make_branch_and_tree('tree_a')
         tree_a.branch.get_config_stack().set(
             'email', 'J. Random Hacker <[e-mail]>')
-        self.build_tree_contents([('tree_a/file', 'content_a\ncontent_b\n'),
-                                  ('tree_a/file_2', 'content_x\rcontent_y\r')])
+        self.build_tree_contents([('tree_a/file', b'content_a\ncontent_b\n'),
+                                  ('tree_a/file_2', b'content_x\rcontent_y\r')])
         tree_a.add(['file', 'file_2'])
-        tree_a.commit('message', rev_id='rev1')
+        tree_a.commit('message', rev_id=b'rev1')
         tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
         branch_c = tree_a.controldir.sprout('branch_c').open_branch()
-        tree_b.commit('message', rev_id='rev2b')
-        self.build_tree_contents([('tree_a/file', 'content_a\ncontent_c \n'),
-                                  ('tree_a/file_2', 'content_x\rcontent_z\r')])
-        tree_a.commit('Commit of rev2a', rev_id='rev2a')
+        tree_b.commit('message', rev_id=b'rev2b')
+        self.build_tree_contents([('tree_a/file', b'content_a\ncontent_c \n'),
+                                  ('tree_a/file_2', b'content_x\rcontent_z\r')])
+        tree_a.commit('Commit of rev2a', rev_id=b'rev2a')
         return tree_a, tree_b, branch_c
 
     def test_empty_target(self):
         tree_a, tree_b, branch_c = self.make_trees()
         tree_d = self.make_branch_and_tree('tree_d')
-        md2 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
+        md2 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 120,
             tree_d.branch.base, patch_type='diff',
             public_branch=tree_a.branch.base)
 
     def test_disk_name(self):
         tree_a, tree_b, branch_c = self.make_trees()
         tree_a.branch.nick = 'fancy <name>'
-        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
+        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 120,
             tree_b.branch.base)
         self.assertEqual('fancy-name-2', md.get_disk_name(tree_a.branch))
 
     def test_disk_name_old_revno(self):
         tree_a, tree_b, branch_c = self.make_trees()
         tree_a.branch.nick = 'fancy-name'
-        md = self.from_objects(tree_a.branch.repository, 'rev1', 500, 120,
+        md = self.from_objects(tree_a.branch.repository, b'rev1', 500, 120,
             tree_b.branch.base)
         self.assertEqual('fancy-name-1', md.get_disk_name(tree_a.branch))
 
     def test_generate_patch(self):
         tree_a, tree_b, branch_c = self.make_trees()
-        md2 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
+        md2 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 120,
             tree_b.branch.base, patch_type='diff',
             public_branch=tree_a.branch.base)
         self.assertNotContainsRe(md2.patch, 'Bazaar revision bundle')
@@ -401,37 +401,37 @@
     def test_public_branch(self):
         tree_a, tree_b, branch_c = self.make_trees()
         self.assertRaises(errors.PublicBranchOutOfDate,
-            self.from_objects, tree_a.branch.repository, 'rev2a', 500, 144,
+            self.from_objects, tree_a.branch.repository, b'rev2a', 500, 144,
             tree_b.branch.base, public_branch=branch_c.base, patch_type='diff')
         self.assertRaises(errors.PublicBranchOutOfDate,
-            self.from_objects, tree_a.branch.repository, 'rev2a', 500, 144,
+            self.from_objects, tree_a.branch.repository, b'rev2a', 500, 144,
             tree_b.branch.base, public_branch=branch_c.base, patch_type=None)
         # public branch is not checked if patch format is bundle.
-        md1 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 144,
+        md1 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 144,
             tree_b.branch.base, public_branch=branch_c.base)
         # public branch is provided with a bundle, despite possibly being out
         # of date, because it's not required if a bundle is present.
         self.assertEqual(md1.source_branch, branch_c.base)
         # Once we update the public branch, we can generate a diff.
         branch_c.pull(tree_a.branch)
-        md3 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 144,
+        md3 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 144,
             tree_b.branch.base, patch_type=None, public_branch=branch_c.base)
 
     def test_use_public_submit_branch(self):
         tree_a, tree_b, branch_c = self.make_trees()
         branch_c.pull(tree_a.branch)
-        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 144,
+        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 144,
             tree_b.branch.base, patch_type=None, public_branch=branch_c.base)
         self.assertEqual(md.target_branch, tree_b.branch.base)
         tree_b.branch.set_public_branch('http://example.com')
         md2 = self.from_objects(
-              tree_a.branch.repository, 'rev2a', 500, 144, tree_b.branch.base,
+              tree_a.branch.repository, b'rev2a', 500, 144, tree_b.branch.base,
               patch_type=None, public_branch=branch_c.base)
         self.assertEqual(md2.target_branch, 'http://example.com')
 
     def test_message(self):
         tree_a, tree_b, branch_c = self.make_trees()
-        md3 = self.from_objects(tree_a.branch.repository, 'rev1', 500, 120,
+        md3 = self.from_objects(tree_a.branch.repository, b'rev1', 500, 120,
             tree_b.branch.base, patch_type=None, public_branch=branch_c.base,
             message='Merge message')
         md3.to_lines()
@@ -440,7 +440,7 @@
 
     def test_generate_bundle(self):
         tree_a, tree_b, branch_c = self.make_trees()
-        md1 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
+        md1 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 120,
             tree_b.branch.base, public_branch=branch_c.base)
 
         self.assertContainsRe(md1.get_raw_bundle(), 'Bazaar revision bundle')
@@ -451,12 +451,12 @@
 
     def test_broken_bundle(self):
         tree_a, tree_b, branch_c = self.make_trees()
-        md1 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
+        md1 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 120,
             tree_b.branch.base, public_branch=branch_c.base)
         lines = md1.to_lines()
         lines = [l.replace('\n', '\r\n') for l in lines]
         md2 = merge_directive.MergeDirective.from_lines(lines)
-        self.assertEqual('rev2a', md2.revision_id)
+        self.assertEqual(b'rev2a', md2.revision_id)
 
     def test_signing(self):
         time = 453
@@ -479,7 +479,7 @@
 
     def test_email(self):
         tree_a, tree_b, branch_c = self.make_trees()
-        md = self.from_objects(tree_a.branch.repository, 'rev2a', 476, 60,
+        md = self.from_objects(tree_a.branch.repository, b'rev2a', 476, 60,
             tree_b.branch.base, patch_type=None,
             public_branch=tree_a.branch.base)
         message = md.to_email('[e-mail]', tree_a.branch)
@@ -490,20 +490,20 @@
 
     def test_install_revisions_branch(self):
         tree_a, tree_b, branch_c = self.make_trees()
-        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 36,
+        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 36,
             tree_b.branch.base, patch_type=None,
             public_branch=tree_a.branch.base)
-        self.assertFalse(tree_b.branch.repository.has_revision('rev2a'))
+        self.assertFalse(tree_b.branch.repository.has_revision(b'rev2a'))
         revision = md.install_revisions(tree_b.branch.repository)
-        self.assertEqual('rev2a', revision)
-        self.assertTrue(tree_b.branch.repository.has_revision('rev2a'))
+        self.assertEqual(b'rev2a', revision)
+        self.assertTrue(tree_b.branch.repository.has_revision(b'rev2a'))
 
     def test_get_merge_request(self):
         tree_a, tree_b, branch_c = self.make_trees()
-        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 36,
+        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 36,
             tree_b.branch.base, patch_type='bundle',
             public_branch=tree_a.branch.base)
-        self.assertFalse(tree_b.branch.repository.has_revision('rev2a'))
+        self.assertFalse(tree_b.branch.repository.has_revision(b'rev2a'))
         md.install_revisions(tree_b.branch.repository)
         base, revision, verified = md.get_merge_request(
             tree_b.branch.repository)
@@ -511,11 +511,11 @@
             self.assertIs(None, base)
             self.assertEqual('inapplicable', verified)
         else:
-            self.assertEqual('rev1', base)
+            self.assertEqual(b'rev1', base)
             self.assertEqual('verified', verified)
-        self.assertEqual('rev2a', revision)
-        self.assertTrue(tree_b.branch.repository.has_revision('rev2a'))
-        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 36,
+        self.assertEqual(b'rev2a', revision)
+        self.assertTrue(tree_b.branch.repository.has_revision(b'rev2a'))
+        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 36,
             tree_b.branch.base, patch_type=None,
             public_branch=tree_a.branch.base)
         base, revision, verified = md.get_merge_request(
@@ -524,9 +524,9 @@
             self.assertIs(None, base)
             self.assertEqual('inapplicable', verified)
         else:
-            self.assertEqual('rev1', base)
+            self.assertEqual(b'rev1', base)
             self.assertEqual('inapplicable', verified)
-        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 36,
+        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 36,
             tree_b.branch.base, patch_type='diff',
             public_branch=tree_a.branch.base)
         base, revision, verified = md.get_merge_request(
@@ -535,7 +535,7 @@
             self.assertIs(None, base)
             self.assertEqual('inapplicable', verified)
         else:
-            self.assertEqual('rev1', base)
+            self.assertEqual(b'rev1', base)
             self.assertEqual('verified', verified)
         md.patch='asdf'
         base, revision, verified = md.get_merge_request(
@@ -544,45 +544,45 @@
             self.assertIs(None, base)
             self.assertEqual('inapplicable', verified)
         else:
-            self.assertEqual('rev1', base)
+            self.assertEqual(b'rev1', base)
             self.assertEqual('failed', verified)
 
     def test_install_revisions_bundle(self):
         tree_a, tree_b, branch_c = self.make_trees()
-        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 36,
+        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 36,
             tree_b.branch.base, patch_type='bundle',
             public_branch=tree_a.branch.base)
-        self.assertFalse(tree_b.branch.repository.has_revision('rev2a'))
+        self.assertFalse(tree_b.branch.repository.has_revision(b'rev2a'))
         revision = md.install_revisions(tree_b.branch.repository)
-        self.assertEqual('rev2a', revision)
-        self.assertTrue(tree_b.branch.repository.has_revision('rev2a'))
+        self.assertEqual(b'rev2a', revision)
+        self.assertTrue(tree_b.branch.repository.has_revision(b'rev2a'))
 
     def test_get_target_revision_nofetch(self):
         tree_a, tree_b, branch_c = self.make_trees()
         tree_b.branch.fetch(tree_a.branch)
-        md = self.from_objects( tree_a.branch.repository, 'rev2a', 500, 36,
+        md = self.from_objects( tree_a.branch.repository, b'rev2a', 500, 36,
             tree_b.branch.base, patch_type=None,
             public_branch=tree_a.branch.base)
         md.source_branch = '/dev/null'
         revision = md.install_revisions(tree_b.branch.repository)
-        self.assertEqual('rev2a', revision)
+        self.assertEqual(b'rev2a', revision)
 
     def test_use_submit_for_missing_dependency(self):
         tree_a, tree_b, branch_c = self.make_trees()
         branch_c.pull(tree_a.branch)
         self.build_tree_contents([('tree_a/file', 'content_q\ncontent_r\n')])
-        tree_a.commit('rev3a', rev_id='rev3a')
-        md = self.from_objects(tree_a.branch.repository, 'rev3a', 500, 36,
-            branch_c.base, base_revision_id='rev2a')
+        tree_a.commit('rev3a', rev_id=b'rev3a')
+        md = self.from_objects(tree_a.branch.repository, b'rev3a', 500, 36,
+            branch_c.base, base_revision_id=b'rev2a')
         revision = md.install_revisions(tree_b.branch.repository)
 
     def test_handle_target_not_a_branch(self):
         tree_a, tree_b, branch_c = self.make_trees()
         branch_c.pull(tree_a.branch)
         self.build_tree_contents([('tree_a/file', 'content_q\ncontent_r\n')])
-        tree_a.commit('rev3a', rev_id='rev3a')
-        md = self.from_objects(tree_a.branch.repository, 'rev3a', 500, 36,
-            branch_c.base, base_revision_id='rev2a')
+        tree_a.commit('rev3a', rev_id=b'rev3a')
+        md = self.from_objects(tree_a.branch.repository, b'rev3a', 500, 36,
+            branch_c.base, base_revision_id=b'rev2a')
         md.target_branch = self.get_url('not-a-branch')
         self.assertRaises(errors.TargetNotBranch, md.install_revisions,
                 tree_b.branch.repository)
@@ -651,11 +651,11 @@
 
     def test_base_revision(self):
         tree_a, tree_b, branch_c = self.make_trees()
-        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 60,
+        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 60,
             tree_b.branch.base, patch_type='bundle',
             public_branch=tree_a.branch.base, base_revision_id=None)
-        self.assertEqual('rev1', md.base_revision_id)
-        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 60,
+        self.assertEqual(b'rev1', md.base_revision_id)
+        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 60,
             tree_b.branch.base, patch_type='bundle',
             public_branch=tree_a.branch.base, base_revision_id='null:')
         self.assertEqual('null:', md.base_revision_id)
@@ -665,7 +665,7 @@
 
     def test_patch_verification(self):
         tree_a, tree_b, branch_c = self.make_trees()
-        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 60,
+        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 60,
             tree_b.branch.base, patch_type='bundle',
             public_branch=tree_a.branch.base)
         lines = md.to_lines()

=== modified file 'breezy/tests/test_smart_transport.py'
--- breezy/tests/test_smart_transport.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/test_smart_transport.py	2018-03-24 23:50:35 +0000
@@ -1241,27 +1241,27 @@
 
     def test_version_three(self):
         result = medium._get_protocol_factory_for_bytes(
-            'bzr message 3 (bzr 1.6)\nextra bytes')
+            b'bzr message 3 (bzr 1.6)\nextra bytes')
         protocol_factory, remainder = result
         self.assertEqual(
             protocol.build_server_protocol_three, protocol_factory)
-        self.assertEqual('extra bytes', remainder)
+        self.assertEqual(b'extra bytes', remainder)
 
     def test_version_two(self):
         result = medium._get_protocol_factory_for_bytes(
-            'bzr request 2\nextra bytes')
+            b'bzr request 2\nextra bytes')
         protocol_factory, remainder = result
         self.assertEqual(
             protocol.SmartServerRequestProtocolTwo, protocol_factory)
-        self.assertEqual('extra bytes', remainder)
+        self.assertEqual(b'extra bytes', remainder)
 
     def test_version_one(self):
         """Version one requests have no version markers."""
-        result = medium._get_protocol_factory_for_bytes('anything\n')
+        result = medium._get_protocol_factory_for_bytes(b'anything\n')
         protocol_factory, remainder = result
         self.assertEqual(
             protocol.SmartServerRequestProtocolOne, protocol_factory)
-        self.assertEqual('anything\n', remainder)
+        self.assertEqual(b'anything\n', remainder)
 
 
 class TestSmartTCPServer(tests.TestCase):

=== modified file 'breezy/tests/test_testament.py'
--- breezy/tests/test_testament.py	2017-09-26 00:55:04 +0000
+++ breezy/tests/test_testament.py	2018-03-24 23:50:35 +0000
@@ -38,7 +38,7 @@
     def setUp(self):
         super(TestamentSetup, self).setUp()
         self.wt = self.make_branch_and_tree('.', format='development-subtree')
-        self.wt.set_root_id('TREE_ROT')
+        self.wt.set_root_id(b'TREE_ROT')
         b = self.b = self.wt.branch
         b.nick = "test branch"
         self.wt.commit(message='initial null commit',
@@ -50,7 +50,7 @@
                              ('src/', ),
                              ('src/foo.c', 'int main()\n{\n}\n')])
         self.wt.add(['hello', 'src', 'src/foo.c'],
-                             ['hello-id', 'src-id', 'foo.c-id'])
+                             [b'hello-id', b'src-id', b'foo.c-id'])
         tt = TreeTransform(self.wt)
         trans_id = tt.trans_id_tree_path('hello')
         tt.set_executability(True, trans_id)

=== modified file 'breezy/tests/test_treeshape.py'
--- breezy/tests/test_treeshape.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/test_treeshape.py	2018-03-24 23:50:35 +0000
@@ -29,16 +29,16 @@
     def test_build_tree(self):
         """Test tree-building test helper"""
         self.build_tree_contents([
-            ('foo', 'new contents'),
+            ('foo', b'new contents'),
             ('.bzr/',),
-            ('.bzr/README', 'hello'),
+            ('.bzr/README', b'hello'),
             ])
         self.assertPathExists('foo')
         self.assertPathExists('.bzr/README')
-        self.assertFileEqual('hello', '.bzr/README')
+        self.assertFileEqual('hello', b'.bzr/README')
 
     def test_build_tree_symlink(self):
         self.requireFeature(features.SymlinkFeature)
-        self.build_tree_contents([('link@', 'target')])
+        self.build_tree_contents([('link@', b'target')])
         self.assertEqual('target',
             os.readlink('link'))

=== modified file 'breezy/tests/test_xml.py'
--- breezy/tests/test_xml.py	2017-06-08 23:30:31 +0000
+++ breezy/tests/test_xml.py	2018-03-24 23:50:35 +0000
@@ -32,7 +32,7 @@
 from . import TestCase
 import breezy.bzr.xml5
 
-_revision_v5 = """<revision committer="Martin Pool &lt;[e-mail]&gt;"
+_revision_v5 = b"""<revision committer="Martin Pool &lt;[e-mail]&gt;"
     inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
     revision_id="[e-mail]-20050905080035-e0439293f8b6b9f9"
     timestamp="1125907235.212"
@@ -46,7 +46,7 @@
 </revision>
 """
 
-_revision_v5_utc = """\
+_revision_v5_utc = b"""\
 <revision committer="Martin Pool &lt;[e-mail]&gt;"
     inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
     revision_id="[e-mail]-20050905080035-e0439293f8b6b9f9"
@@ -61,7 +61,7 @@
 </revision>
 """
 
-_committed_inv_v5 = """<inventory>
+_committed_inv_v5 = b"""<inventory>
 <file file_id="bar-20050901064931-73b4b1138abc9cd2"
       name="bar" parent_id="TREE_ROOT"
       revision="mbp@foo-123123"
@@ -77,7 +77,7 @@
 </inventory>
 """
 
-_basis_inv_v5 = """<inventory revision_id="[e-mail]-20050905063503-43948f59fa127d92">
+_basis_inv_v5 = b"""<inventory revision_id="[e-mail]-20050905063503-43948f59fa127d92">
 <file file_id="bar-20050901064931-73b4b1138abc9cd2"
       name="bar" parent_id="TREE_ROOT"
       revision="mbp@foo-123123"/>
@@ -93,7 +93,7 @@
 
 
 # DO NOT REFLOW THIS. Its the exact revision we want.
-_expected_rev_v5 = """<revision committer="Martin Pool &lt;[e-mail]&gt;" format="5" inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41" revision_id="[e-mail]-20050905080035-e0439293f8b6b9f9" timestamp="1125907235.212" timezone="36000">
+_expected_rev_v5 = b"""<revision committer="Martin Pool &lt;[e-mail]&gt;" format="5" inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41" revision_id="[e-mail]-20050905080035-e0439293f8b6b9f9" timestamp="1125907235.212" timezone="36000">
 <message>- start splitting code for xml (de)serialization away from objects
   preparatory to supporting multiple formats by a single library
 </message>
@@ -105,7 +105,7 @@
 
 
 # DO NOT REFLOW THIS. Its the exact inventory we want.
-_expected_inv_v5 = """<inventory format="5">
+_expected_inv_v5 = b"""<inventory format="5">
 <file file_id="bar-20050901064931-73b4b1138abc9cd2" name="bar" revision="mbp@foo-123123" text_sha1="A" text_size="1" />
 <directory file_id="foo-20050801201819-4139aa4a272f4250" name="subdir" revision="mbp@foo-00" />
 <file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134" name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" revision="mbp@foo-00" text_sha1="B" text_size="0" />
@@ -113,7 +113,7 @@
 """
 
 
-_expected_inv_v5_root = """<inventory file_id="f&lt;" format="5" revision_id="mother!">
+_expected_inv_v5_root = b"""<inventory file_id="f&lt;" format="5" revision_id="mother!">
 <file file_id="bar-20050901064931-73b4b1138abc9cd2" name="bar" parent_id="f&lt;" revision="mbp@foo-123123" text_sha1="A" text_size="1" />
 <directory file_id="foo-20050801201819-4139aa4a272f4250" name="subdir" parent_id="f&lt;" revision="mbp@foo-00" />
 <file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134" name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" revision="mbp@foo-00" text_sha1="B" text_size="0" />
@@ -121,7 +121,7 @@
 </inventory>
 """
 
-_expected_inv_v6 = """<inventory format="6" revision_id="rev_outer">
+_expected_inv_v6 = b"""<inventory format="6" revision_id="rev_outer">
 <directory file_id="tree-root-321" name="" revision="rev_outer" />
 <directory file_id="dir-id" name="dir" parent_id="tree-root-321" revision="rev_outer" />
 <file file_id="file-id" name="file" parent_id="tree-root-321" revision="rev_outer" text_sha1="A" text_size="1" />
@@ -129,7 +129,7 @@
 </inventory>
 """
 
-_expected_inv_v7 = """<inventory format="7" revision_id="rev_outer">
+_expected_inv_v7 = b"""<inventory format="7" revision_id="rev_outer">
 <directory file_id="tree-root-321" name="" revision="rev_outer" />
 <directory file_id="dir-id" name="dir" parent_id="tree-root-321" revision="rev_outer" />
 <file file_id="file-id" name="file" parent_id="tree-root-321" revision="rev_outer" text_sha1="A" text_size="1" />
@@ -138,7 +138,7 @@
 </inventory>
 """
 
-_expected_rev_v8 = """<revision committer="Martin Pool &lt;[e-mail]&gt;" format="8" inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41" revision_id="[e-mail]-20050905080035-e0439293f8b6b9f9" timestamp="1125907235.212" timezone="36000">
+_expected_rev_v8 = b"""<revision committer="Martin Pool &lt;[e-mail]&gt;" format="8" inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41" revision_id="[e-mail]-20050905080035-e0439293f8b6b9f9" timestamp="1125907235.212" timezone="36000">
 <message>- start splitting code for xml (de)serialization away from objects
   preparatory to supporting multiple formats by a single library
 </message>
@@ -148,7 +148,7 @@
 </revision>
 """
 
-_expected_inv_v8 = """<inventory format="8" revision_id="rev_outer">
+_expected_inv_v8 = b"""<inventory format="8" revision_id="rev_outer">
 <directory file_id="tree-root-321" name="" revision="rev_outer" />
 <directory file_id="dir-id" name="dir" parent_id="tree-root-321" revision="rev_outer" />
 <file file_id="file-id" name="file" parent_id="tree-root-321" revision="rev_outer" text_sha1="A" text_size="1" />
@@ -156,7 +156,7 @@
 </inventory>
 """
 
-_revision_utf8_v5 = """<revision committer="Erik B&#229;gfors &lt;[e-mail]&gt;"
+_revision_utf8_v5 = b"""<revision committer="Erik B&#229;gfors &lt;[e-mail]&gt;"
     inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
     revision_id="erik@b&#229;gfors-02"
     timestamp="1125907235.212"
@@ -169,7 +169,7 @@
 </revision>
 """
 
-_inventory_utf8_v5 = """<inventory file_id="TRE&#233;_ROOT" format="5"
+_inventory_utf8_v5 = b"""<inventory file_id="TRE&#233;_ROOT" format="5"
                                    revision_id="erik@b&#229;gfors-02">
 <file file_id="b&#229;r-01"
       name="b&#229;r" parent_id="TRE&#233;_ROOT"
@@ -185,12 +185,12 @@
 """
 
 # Before revision_id was always stored as an attribute
-_inventory_v5a = """<inventory format="5">
+_inventory_v5a = b"""<inventory format="5">
 </inventory>
 """
 
 # Before revision_id was always stored as an attribute
-_inventory_v5b = """<inventory format="5" revision_id="a-rev-id">
+_inventory_v5b = b"""<inventory format="5" revision_id="a-rev-id">
 </inventory>
 """
 

=== modified file 'breezy/transform.py'
--- breezy/transform.py	2018-03-24 17:54:01 +0000
+++ breezy/transform.py	2018-03-24 23:50:35 +0000
@@ -902,8 +902,8 @@
         from_path = self._tree_id_paths.get(from_trans_id)
         if from_versioned:
             # get data from working tree if versioned
-            from_entry = self._tree.iter_entries_by_dir(
-                    specific_files=[from_path]).next()[1]
+            from_entry = next(self._tree.iter_entries_by_dir(
+                    specific_files=[from_path]))[1]
             from_name = from_entry.name
             from_parent = from_entry.parent_id
         else:

=== modified file 'breezy/workingtree.py'
--- breezy/workingtree.py	2018-03-24 17:48:04 +0000
+++ breezy/workingtree.py	2018-03-24 23:50:35 +0000
@@ -590,7 +590,7 @@
 
     def _set_merges_from_parent_ids(self, parent_ids):
         merges = parent_ids[1:]
-        self._transport.put_bytes('pending-merges', '\n'.join(merges),
+        self._transport.put_bytes('pending-merges', b'\n'.join(merges),
             mode=self.controldir._get_file_mode())
 
     def _filter_parent_ids_by_ancestry(self, revision_ids):

=== modified file 'python3.passing'
--- python3.passing	2018-02-17 00:13:07 +0000
+++ python3.passing	2018-03-24 23:50:35 +0000
@@ -1,5 +1,6 @@
 # This is the list of tests that are known to pass with Python3.
 # "make check-nodocs3" verifies that these pass.
+breezy.doc.api.DocFileTest(branch_txt)
 breezy.doc.api.DocFileTest(transport_txt)
 breezy.iterablefile.IterableFile.close
 breezy.iterablefile.IterableFile.flush
@@ -55,32 +56,50 @@
 breezy.plugins.stats.test_stats.TestCollapseByPerson.test_different_name_case
 breezy.plugins.stats.test_stats.TestCollapseByPerson.test_no_conflicts
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_push_location_exact(BranchReferenceFormat)
+breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_push_location_exact(BzrBranchFormat4)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_push_location_exact(BzrBranchFormat5)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_push_location_exact(BzrBranchFormat6)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_push_location_exact(BzrBranchFormat7)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_push_location_exact(BzrBranchFormat8)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_upload_location_unset(BranchReferenceFormat)
+breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_upload_location_unset(BzrBranchFormat4)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_upload_location_unset(BzrBranchFormat5)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_upload_location_unset(BzrBranchFormat6)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_upload_location_unset(BzrBranchFormat7)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_upload_location_unset(BzrBranchFormat8)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_set_push_location(BranchReferenceFormat)
+breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_set_push_location(BzrBranchFormat4)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_set_push_location(BzrBranchFormat5)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_set_push_location(BzrBranchFormat6)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_set_push_location(BzrBranchFormat7)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_set_push_location(BzrBranchFormat8)
 breezy.plugins.weave_fmt.test_bzrdir.SFTPBranchTest.test_lock_file
 breezy.plugins.weave_fmt.test_bzrdir.TestBranchFormat4.test_no_metadir_support
+breezy.plugins.weave_fmt.test_bzrdir.TestBranchFormat4.test_supports_bzrdir_6
+breezy.plugins.weave_fmt.test_bzrdir.TestFormat5.test_can_convert
+breezy.plugins.weave_fmt.test_bzrdir.TestFormat5.test_needs_conversion
+breezy.plugins.weave_fmt.test_bzrdir.TestFormat6.test_can_convert
+breezy.plugins.weave_fmt.test_bzrdir.TestFormat6.test_needs_conversion
+breezy.plugins.weave_fmt.test_bzrdir.V4WeaveBundleTester.test_crlf_bundle
+breezy.plugins.weave_fmt.test_repository.TestFormat6.test_attribute__fetch_order
+breezy.plugins.weave_fmt.test_repository.TestFormat6.test_attribute__fetch_reconcile
+breezy.plugins.weave_fmt.test_repository.TestFormat6.test_attribute__fetch_uses_deltas
+breezy.plugins.weave_fmt.test_repository.TestFormat6.test_no_ancestry_weave
+breezy.plugins.weave_fmt.test_repository.TestFormat6.test_supports_external_lookups
 breezy.plugins.weave_fmt.test_repository.TestFormat7.test_attribute__fetch_order
 breezy.plugins.weave_fmt.test_repository.TestFormat7.test_attribute__fetch_reconcile
 breezy.plugins.weave_fmt.test_repository.TestFormat7.test_attribute__fetch_uses_deltas
 breezy.plugins.weave_fmt.test_repository.TestFormat7.test_creates_lockdir
 breezy.plugins.weave_fmt.test_repository.TestFormat7.test_supports_external_lookups
+breezy.plugins.weave_fmt.test_repository.TestFormat7.test_uses_lockdir
 breezy.plugins.weave_fmt.test_repository.TestInterWeaveRepo.test_is_compatible_and_registered
+breezy.plugins.weave_fmt.test_repository.TestSerializer.test_canned_inventory
 breezy.plugins.weave_fmt.test_repository.TestSerializer.test_registry
+breezy.plugins.weave_fmt.test_repository.TestSerializer.test_unpack_revision
 breezy.plugins.weave_fmt.test_store.TestCompressedTextStore.test_multiple_add
 breezy.plugins.weave_fmt.test_store.TestCompressedTextStore.test_total_size
 breezy.plugins.weave_fmt.test_store.TestInstrumentedTransportStore.test__add_records
+breezy.plugins.weave_fmt.test_store.TestMemoryStore.test_add_and_retrieve
 breezy.plugins.weave_fmt.test_store.TestMemoryStore.test_adding_fails_when_present
 breezy.plugins.weave_fmt.test_store.TestMemoryStore.test_missing_is_absent
 breezy.plugins.weave_fmt.test_store.TestMemoryStore.test_total_size
@@ -99,6 +118,8 @@
 breezy.plugins.weave_fmt.test_store.TestTransportStore.test__relpath_simple
 breezy.plugins.weave_fmt.test_store.TestTransportStore.test__relpath_simple_suffixed
 breezy.plugins.weave_fmt.test_store.TestTransportStore.test__relpath_unregister_suffixes
+breezy.plugins.weave_fmt.test_store.TestVersionFileStore.test_get_weave_readonly_cant_write
+breezy.plugins.weave_fmt.test_store.TestVersionFileStore.test_get_weave_registers_dirty_in_write
 breezy.pyutils.get_named_object
 breezy.symbol_versioning.deprecated_in
 breezy.tests.commands.test_branch.TestBranch.test_branch_local_remote
@@ -121,54 +142,65 @@
 breezy.tests.commands.test_update.TestUpdate.test_update
 breezy.tests.multiply_tests
 breezy.tests.per_branch.test_branch.TestBound.test_bind_clears_cached_master_branch(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBound.test_bind_clears_cached_master_branch(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestBound.test_bind_clears_cached_master_branch(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBound.test_bind_clears_cached_master_branch(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestBound.test_bind_clears_cached_master_branch(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBound.test_bind_diverged(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBound.test_bind_unbind(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBound.test_bind_unbind(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestBound.test_bind_unbind(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBound.test_bind_unbind(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestBound.test_bind_unbind(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBound.test_old_bound_location(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBound.test_old_bound_location(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestBound.test_old_bound_location(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestBound.test_old_bound_location(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBound.test_old_bound_location(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestBound.test_old_bound_location(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBound.test_set_bound_location_clears_cached_master_branch(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBound.test_set_bound_location_clears_cached_master_branch(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestBound.test_set_bound_location_clears_cached_master_branch(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBound.test_set_bound_location_clears_cached_master_branch(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestBound.test_set_bound_location_clears_cached_master_branch(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBound.test_unbind_clears_cached_master_branch(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBound.test_unbind_clears_cached_master_branch(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestBound.test_unbind_clears_cached_master_branch(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBound.test_unbind_clears_cached_master_branch(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestBound.test_unbind_clears_cached_master_branch(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranchControlComponent.test_urls(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranchControlComponent.test_urls(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestBranchControlComponent.test_urls(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestBranchControlComponent.test_urls(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranchControlComponent.test_urls(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestBranchControlComponent.test_urls(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranchFormat.test_branch_format_network_name(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranchFormat.test_get_config_calls(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranchFormat.test_get_config_calls(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestBranchFormat.test_get_config_calls(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestBranchFormat.test_get_config_calls(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranchFormat.test_get_config_calls(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestBranchFormat.test_get_config_calls(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_exact(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_exact(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_exact(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_exact(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_exact(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_exact(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_unset(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_unset(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_unset(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_unset(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_unset(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_unset(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_set_push_location(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_set_push_location(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_set_push_location(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_set_push_location(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_set_push_location(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_set_push_location(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_bad_revision(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_bad_revision(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestBranch.test_bad_revision(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestBranch.test_bad_revision(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_bad_revision(BzrBranchFormat7)
@@ -187,17 +219,20 @@
 breezy.tests.per_branch.test_branch.TestBranch.test_create_anonymous_heavyweight_checkout(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_anonymous_lightweight_checkout(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_append_revisions_only(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_create_append_revisions_only(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_append_revisions_only(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_append_revisions_only(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_append_revisions_only(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_append_revisions_only(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_checkout(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_colocated(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_create_colocated(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_colocated(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_colocated(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_colocated(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_colocated(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_open_branch_uses_repository(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_create_open_branch_uses_repository(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_open_branch_uses_repository(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_open_branch_uses_repository(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_open_branch_uses_repository(BzrBranchFormat7)
@@ -212,11 +247,13 @@
 breezy.tests.per_branch.test_branch.TestBranch.test_generate_revision_history(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_generate_revision_history_NULL_REVISION(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_get_commit_builder(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_get_commit_builder(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestBranch.test_get_commit_builder(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestBranch.test_get_commit_builder(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_get_commit_builder(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestBranch.test_get_commit_builder(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_get_set_append_revisions_only(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_get_set_append_revisions_only(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestBranch.test_get_set_append_revisions_only(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestBranch.test_get_set_append_revisions_only(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_get_set_append_revisions_only(BzrBranchFormat7)
@@ -228,16 +265,19 @@
 breezy.tests.per_branch.test_branch.TestBranch.test_heads_to_fetch_not_null_revision(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestBranch.test_heads_to_fetch_not_null_revision(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_nicks(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_nicks(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestBranch.test_nicks(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestBranch.test_nicks(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_nicks(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestBranch.test_nicks(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_nicks_bzr(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_nicks_bzr(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestBranch.test_nicks_bzr(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestBranch.test_nicks_bzr(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_nicks_bzr(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestBranch.test_nicks_bzr(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_public_branch(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_public_branch(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestBranch.test_public_branch(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestBranch.test_public_branch(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_public_branch(BzrBranchFormat7)
@@ -246,66 +286,80 @@
 breezy.tests.per_branch.test_branch.TestBranch.test_record_two_ghosts(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_revision_ids_are_utf8(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_submit_branch(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_submit_branch(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestBranch.test_submit_branch(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestBranch.test_submit_branch(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_submit_branch(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestBranch.test_submit_branch(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format_default(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format_default(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format_default(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format_default(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format_default(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format_default(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestFormat.test_format_initialize_find_open(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestFormat.test_get_reference(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestFormat.test_get_reference(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestFormat.test_get_reference(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestFormat.test_get_reference(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestFormat.test_get_reference(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestFormat.test_get_reference(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestFormat.test_set_reference(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestFormat.test_set_reference(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestFormat.test_set_reference(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestFormat.test_set_reference(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestFormat.test_set_reference(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestFormat.test_set_reference(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestIgnoreFallbacksParameter.test_fallbacks_are_opened(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestIgnoreFallbacksParameter.test_fallbacks_are_opened(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestIgnoreFallbacksParameter.test_fallbacks_are_opened(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestIgnoreFallbacksParameter.test_fallbacks_are_opened(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestIgnoreFallbacksParameter.test_fallbacks_not_opened(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestIgnoreFallbacksParameter.test_fallbacks_not_opened(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestIgnoreFallbacksParameter.test_fallbacks_not_opened(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestIgnoreFallbacksParameter.test_fallbacks_not_opened(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestIgnoreFallbacksParameter.test_fallbacks_not_opened(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestIgnoreFallbacksParameter.test_fallbacks_not_opened(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_branch_relative_reference_location(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_branch_relative_reference_location(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_branch_relative_reference_location(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_branch_relative_reference_location(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_branch_relative_reference_location(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_branch_relative_reference_location(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_clone_copies_reference_location(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_clone_copies_reference_location(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_clone_copies_reference_location(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_clone_copies_reference_location(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_clone_copies_reference_location(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_copied_locations_are_rebased(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_copied_locations_are_rebased(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_copied_locations_are_rebased(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_copied_locations_are_rebased(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_copied_locations_are_rebased(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_get_reference_info(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_get_reference_info(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_get_reference_info(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_get_reference_info(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_get_reference_info(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_get_reference_info(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_merge_updates_references(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_merge_updates_references(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_merge_updates_references(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_merge_updates_references(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_merge_updates_references(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_pull_updates_references(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_pull_updates_references(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_pull_updates_references(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_pull_updates_references(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_pull_updates_references(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_push_updates_references(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_push_updates_references(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_push_updates_references(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_push_updates_references(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_push_updates_references(BzrBranchFormat7)
@@ -320,49 +374,59 @@
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent_from_reference_info_(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent_from_reference_info_(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent_from_reference_info_(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent_from_reference_info_(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent_from_reference_info_(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent_from_reference_info_(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_get_reference_info(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_get_reference_info(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_get_reference_info(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_get_reference_info(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_get_reference_info(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_get_reference_info(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info_when_null(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info_when_null(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info_when_null(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info_when_null(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info_when_null(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info_when_null(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_requires_two_nones(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_requires_two_nones(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_requires_two_nones(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_requires_two_nones(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_requires_two_nones(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_requires_two_nones(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_reference_info(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_reference_info(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_reference_info(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_reference_info(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_reference_info(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_reference_info(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_sprout_copies_reference_location(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_sprout_copies_reference_location(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_sprout_copies_reference_location(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_sprout_copies_reference_location(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_sprout_copies_reference_location(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_retains_known_references(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_retains_known_references(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_retains_known_references(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_retains_known_references(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_retains_known_references(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_retains_known_references(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_retains_old_references(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_retains_old_references(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_retains_old_references(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_retains_old_references(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_retains_old_references(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_skips_known_references(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_skips_known_references(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_skips_known_references(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_skips_known_references(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_skips_known_references(BzrBranchFormat7)
@@ -377,6 +441,7 @@
 breezy.tests.per_branch.test_branch.TestTestCaseWithBranch.test_branch_format_matches_bzrdir_branch_format(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_branch.TestTestCaseWithBranch.test_branch_format_matches_bzrdir_branch_format(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_branch.TestTestCaseWithBranch.test_make_branch_gets_expected_format(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestTestCaseWithBranch.test_make_branch_gets_expected_format(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestTestCaseWithBranch.test_make_branch_gets_expected_format(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestTestCaseWithBranch.test_make_branch_gets_expected_format(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestTestCaseWithBranch.test_make_branch_gets_expected_format(BzrBranchFormat7)
@@ -388,25 +453,30 @@
 breezy.tests.per_branch.test_branch.TestUncommittedChanges.test_store_uncommitted(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestUncommittedChanges.test_store_uncommitted_none(BranchReferenceFormat)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_locked(BranchReferenceFormat)
+breezy.tests.per_branch.test_break_lock.TestBreakLock.test_locked(BzrBranchFormat4)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_locked(BzrBranchFormat5)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_locked(BzrBranchFormat6)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_locked(BzrBranchFormat7)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_locked(BzrBranchFormat8)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked(BranchReferenceFormat)
+breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked(BzrBranchFormat4)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked(BzrBranchFormat5)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked(BzrBranchFormat6)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked(BzrBranchFormat7)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked(BzrBranchFormat8)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked_repo_locked(BranchReferenceFormat)
+breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked_repo_locked(BzrBranchFormat4)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked_repo_locked(BzrBranchFormat5)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked_repo_locked(BzrBranchFormat6)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked_repo_locked(BzrBranchFormat7)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked_repo_locked(BzrBranchFormat8)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocks_master_branch(BranchReferenceFormat)
+breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocks_master_branch(BzrBranchFormat4)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocks_master_branch(BzrBranchFormat6)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocks_master_branch(BzrBranchFormat7)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocks_master_branch(BzrBranchFormat8)
 breezy.tests.per_branch.test_check.TestBranchCheck.test_check_branch_report_results(BranchReferenceFormat)
+breezy.tests.per_branch.test_check.TestBranchCheck.test_check_branch_report_results(BzrBranchFormat4)
 breezy.tests.per_branch.test_check.TestBranchCheck.test_check_branch_report_results(BzrBranchFormat5)
 breezy.tests.per_branch.test_check.TestBranchCheck.test_check_branch_report_results(BzrBranchFormat6)
 breezy.tests.per_branch.test_check.TestBranchCheck.test_check_branch_report_results(BzrBranchFormat7)
@@ -414,6 +484,7 @@
 breezy.tests.per_branch.test_check.TestBranchCheck.test_check_detects_invalid_revhistory(BranchReferenceFormat)
 breezy.tests.per_branch.test_check.TestBranchCheck.test__get_check_refs(BranchReferenceFormat)
 breezy.tests.per_branch.test_commit.TestCommitHook.test_post_commit_bound(BranchReferenceFormat)
+breezy.tests.per_branch.test_commit.TestCommitHook.test_post_commit_bound(BzrBranchFormat4)
 breezy.tests.per_branch.test_commit.TestCommitHook.test_post_commit_not_to_origin(BranchReferenceFormat)
 breezy.tests.per_branch.test_commit.TestCommitHook.test_post_commit_to_origin(BranchReferenceFormat)
 breezy.tests.per_branch.test_commit.TestCommitHook.test_pre_commit_delta(BranchReferenceFormat)
@@ -421,16 +492,19 @@
 breezy.tests.per_branch.test_commit.TestCommitHook.test_pre_commit_passes(BranchReferenceFormat)
 breezy.tests.per_branch.test_commit.TestCommit.test_commit_nicks(BranchReferenceFormat)
 breezy.tests.per_branch.test_config.TestGetConfig.test_set_submit_branch(BranchReferenceFormat)
+breezy.tests.per_branch.test_config.TestGetConfig.test_set_submit_branch(BzrBranchFormat4)
 breezy.tests.per_branch.test_config.TestGetConfig.test_set_submit_branch(BzrBranchFormat5)
 breezy.tests.per_branch.test_config.TestGetConfig.test_set_submit_branch(BzrBranchFormat6)
 breezy.tests.per_branch.test_config.TestGetConfig.test_set_submit_branch(BzrBranchFormat7)
 breezy.tests.per_branch.test_config.TestGetConfig.test_set_submit_branch(BzrBranchFormat8)
 breezy.tests.per_branch.test_config.TestGetConfig.test_set_user_option_with_dict(BranchReferenceFormat)
+breezy.tests.per_branch.test_config.TestGetConfig.test_set_user_option_with_dict(BzrBranchFormat4)
 breezy.tests.per_branch.test_config.TestGetConfig.test_set_user_option_with_dict(BzrBranchFormat5)
 breezy.tests.per_branch.test_config.TestGetConfig.test_set_user_option_with_dict(BzrBranchFormat6)
 breezy.tests.per_branch.test_config.TestGetConfig.test_set_user_option_with_dict(BzrBranchFormat7)
 breezy.tests.per_branch.test_config.TestGetConfig.test_set_user_option_with_dict(BzrBranchFormat8)
 breezy.tests.per_branch.test_create_checkout.TestCreateCheckout.test_checkout_format_heavyweight(BranchReferenceFormat)
+breezy.tests.per_branch.test_create_checkout.TestCreateCheckout.test_checkout_format_heavyweight(BzrBranchFormat4)
 breezy.tests.per_branch.test_create_checkout.TestCreateCheckout.test_checkout_format_lightweight(BranchReferenceFormat)
 breezy.tests.per_branch.test_create_checkout.TestCreateCheckout.test_create_checkout_exists(BranchReferenceFormat)
 breezy.tests.per_branch.test_create_checkout.TestCreateCheckout.test_create_lightweight_checkout(BranchReferenceFormat)
@@ -533,121 +607,145 @@
 breezy.tests.per_branch.test_last_revision_info.TestLastRevisionInfo.test_empty_branch(BzrBranchFormat7)
 breezy.tests.per_branch.test_last_revision_info.TestLastRevisionInfo.test_empty_branch(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_01_lock_read(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_01_lock_read(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_01_lock_read(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_01_lock_read(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_01_lock_read(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_01_lock_read(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_02_lock_write(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_02_lock_write(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_02_lock_write(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_02_lock_write(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_02_lock_write(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_02_lock_write(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_03_lock_fail_unlock_repo(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_03_lock_fail_unlock_repo(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_03_lock_fail_unlock_repo(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_03_lock_fail_unlock_repo(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_03_lock_fail_unlock_repo(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_03_lock_fail_unlock_repo(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_04_lock_fail_unlock_control(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_04_lock_fail_unlock_control(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_04_lock_fail_unlock_control(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_04_lock_fail_unlock_control(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_04_lock_fail_unlock_control(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_04_lock_fail_unlock_control(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_05_lock_read_fail_repo(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_05_lock_read_fail_repo(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_05_lock_read_fail_repo(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_05_lock_read_fail_repo(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_05_lock_read_fail_repo(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_05_lock_read_fail_repo(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_06_lock_write_fail_repo(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_06_lock_write_fail_repo(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_06_lock_write_fail_repo(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_06_lock_write_fail_repo(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_06_lock_write_fail_repo(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_06_lock_write_fail_repo(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_07_lock_read_fail_control(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_07_lock_read_fail_control(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_07_lock_read_fail_control(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_07_lock_read_fail_control(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_07_lock_read_fail_control(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_07_lock_read_fail_control(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_08_lock_write_fail_control(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_08_lock_write_fail_control(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_08_lock_write_fail_control(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_08_lock_write_fail_control(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_08_lock_write_fail_control(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_08_lock_write_fail_control(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_dont_leave_lock_in_place(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_dont_leave_lock_in_place(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_dont_leave_lock_in_place(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_dont_leave_lock_in_place(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_dont_leave_lock_in_place(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_dont_leave_lock_in_place(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_leave_lock_in_place(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_leave_lock_in_place(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_leave_lock_in_place(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_leave_lock_in_place(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_leave_lock_in_place(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_leave_lock_in_place(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_and_unlock_leaves_repo_unlocked(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_and_unlock_leaves_repo_unlocked(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_and_unlock_leaves_repo_unlocked(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_and_unlock_leaves_repo_unlocked(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_and_unlock_leaves_repo_unlocked(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_and_unlock_leaves_repo_unlocked(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_context_manager(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_context_manager(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_context_manager(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_context_manager(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_context_manager(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_context_manager(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_returns_unlockable(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_returns_unlockable(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_returns_unlockable(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_returns_unlockable(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_returns_unlockable(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_returns_unlockable(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_then_unlock(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_then_unlock(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_then_unlock(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_then_unlock(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_then_unlock(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_then_unlock(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_locks_repo_too(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_locks_repo_too(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_locks_repo_too(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_locks_repo_too(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_locks_repo_too(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_locks_repo_too(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_raises_in_lock_read(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_raises_in_lock_read(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_raises_in_lock_read(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_raises_in_lock_read(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_raises_in_lock_read(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_raises_in_lock_read(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_reenter_with_token(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_reenter_with_token(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_reenter_with_token(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_reenter_with_token(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_reenter_with_token(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_reenter_with_token(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_None_refuses_token(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_None_refuses_token(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_None_refuses_token(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_None_refuses_token(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_None_refuses_token(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_None_refuses_token(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_unlockable(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_unlockable(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_unlockable(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_unlockable(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_unlockable(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_unlockable(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_matching_token(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_matching_token(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_matching_token(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_matching_token(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_matching_token(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_matching_token(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_nonmatching_token(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_nonmatching_token(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_nonmatching_token(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_nonmatching_token(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_nonmatching_token(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_nonmatching_token(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_token_fails_when_unlocked(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_token_fails_when_unlocked(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_token_fails_when_unlocked(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_token_fails_when_unlocked(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_token_fails_when_unlocked(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_token_fails_when_unlocked(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_reentering_lock_write_raises_on_token_mismatch(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_reentering_lock_write_raises_on_token_mismatch(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_reentering_lock_write_raises_on_token_mismatch(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_reentering_lock_write_raises_on_token_mismatch(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_reentering_lock_write_raises_on_token_mismatch(BzrBranchFormat7)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_reentering_lock_write_raises_on_token_mismatch(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_unlock_after_lock_write_with_token(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_unlock_after_lock_write_with_token(BzrBranchFormat4)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_unlock_after_lock_write_with_token(BzrBranchFormat5)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_unlock_after_lock_write_with_token(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_unlock_after_lock_write_with_token(BzrBranchFormat7)
@@ -697,7 +795,9 @@
 breezy.tests.per_branch.test_permissions.TestPermissions.test_new_branch(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_permissions.TestPermissions.test_new_branch(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_bound_branch(BranchReferenceFormat)
+breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_bound_branch(BzrBranchFormat4)
 breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_empty_history(BranchReferenceFormat)
+breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_empty_history(BzrBranchFormat4)
 breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_empty_history(BzrBranchFormat5)
 breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_nonempty_history(BranchReferenceFormat)
 breezy.tests.per_branch.test_pull.TestPull.test_pull_convergence_simple(BranchReferenceFormat)
@@ -716,26 +816,32 @@
 breezy.tests.per_branch.test_push.EmptyPushSmartEffortTests.test_empty_branch_command(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_push.EmptyPushSmartEffortTests.test_empty_branch_command(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_push.TestLossyPush.test_lossy_push_raises_same_vcs(BranchReferenceFormat)
+breezy.tests.per_branch.test_push.TestLossyPush.test_lossy_push_raises_same_vcs(BzrBranchFormat4)
 breezy.tests.per_branch.test_push.TestLossyPush.test_lossy_push_raises_same_vcs(BzrBranchFormat5)
 breezy.tests.per_branch.test_push.TestLossyPush.test_lossy_push_raises_same_vcs(BzrBranchFormat6)
 breezy.tests.per_branch.test_push.TestLossyPush.test_lossy_push_raises_same_vcs(BzrBranchFormat7)
 breezy.tests.per_branch.test_push.TestLossyPush.test_lossy_push_raises_same_vcs(BzrBranchFormat8)
 breezy.tests.per_branch.test_push.TestPushHook.test_post_push_bound_branch(BranchReferenceFormat)
+breezy.tests.per_branch.test_push.TestPushHook.test_post_push_bound_branch(BzrBranchFormat4)
 breezy.tests.per_branch.test_push.TestPushHook.test_post_push_empty_history(BranchReferenceFormat)
+breezy.tests.per_branch.test_push.TestPushHook.test_post_push_empty_history(BzrBranchFormat4)
 breezy.tests.per_branch.test_push.TestPushHook.test_post_push_empty_history(BzrBranchFormat5)
 breezy.tests.per_branch.test_push.TestPushHook.test_post_push_nonempty_history(BranchReferenceFormat)
 breezy.tests.per_branch.test_push.TestPush.test_push_convergence_simple(BranchReferenceFormat)
 breezy.tests.per_branch.test_push.TestPush.test_push_merged_indirect(BranchReferenceFormat)
 breezy.tests.per_branch.test_push.TestPush.test_push_new_tag_to_bound_branch(BranchReferenceFormat)
+breezy.tests.per_branch.test_push.TestPush.test_push_new_tag_to_bound_branch(BzrBranchFormat4)
 breezy.tests.per_branch.test_push.TestPush.test_push_overwrite_of_non_tip_with_stop_revision(BranchReferenceFormat)
 breezy.tests.per_branch.test_push.TestPush.test_push_overwrite_with_older_mainline_rev(BranchReferenceFormat)
 breezy.tests.per_branch.test_push.TestPush.test_push_raises_specific_error_on_master_connection_error(BranchReferenceFormat)
 breezy.tests.per_branch.test_push.TestPush.test_push_repository_no_branch_doesnt_fetch_all_revs(BranchReferenceFormat)
+breezy.tests.per_branch.test_push.TestPush.test_push_repository_no_branch_doesnt_fetch_all_revs(BzrBranchFormat4)
 breezy.tests.per_branch.test_push.TestPush.test_push_to_checkout_updates_master(BranchReferenceFormat)
 breezy.tests.per_branch.test_push.TestPush.test_push_uses_read_lock(BranchReferenceFormat)
 breezy.tests.per_branch.test_push.TestPush.test_push_with_default_stacking_does_not_create_broken_branch(BranchReferenceFormat)
 breezy.tests.per_branch.test_push.TestPush.test_push_with_default_stacking_does_not_create_broken_branch(BzrBranchFormat4)
 breezy.tests.per_branch.test_push.TestPush.test_push_within_repository(BranchReferenceFormat)
+breezy.tests.per_branch.test_push.TestPush.test_push_within_repository(BzrBranchFormat4)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_fixes_invalid_revhistory(BranchReferenceFormat)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_fixes_invalid_revhistory(BzrBranchFormat4)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_fixes_invalid_revhistory(BzrBranchFormat5)
@@ -746,11 +852,13 @@
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_fixes_invalid_revhistory(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_handles_ghosts_in_revhistory(BranchReferenceFormat)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_returns_reconciler(BranchReferenceFormat)
+breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_returns_reconciler(BzrBranchFormat4)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_returns_reconciler(BzrBranchFormat5)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_returns_reconciler(BzrBranchFormat6)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_returns_reconciler(BzrBranchFormat7)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_returns_reconciler(BzrBranchFormat8)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_supports_thorough(BranchReferenceFormat)
+breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_supports_thorough(BzrBranchFormat4)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_supports_thorough(BzrBranchFormat5)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_supports_thorough(BzrBranchFormat6)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_supports_thorough(BzrBranchFormat7)
@@ -805,9 +913,11 @@
 breezy.tests.per_branch.test_stacking.TestStacking.test_fetch_revisions_with_file_changes(BranchReferenceFormat)
 breezy.tests.per_branch.test_stacking.TestStacking.test_get_graph_stacked(BranchReferenceFormat)
 breezy.tests.per_branch.test_stacking.TestStacking.test_get_set_stacked_on_relative(BranchReferenceFormat)
+breezy.tests.per_branch.test_stacking.TestStacking.test_get_set_stacked_on_relative(BzrBranchFormat4)
 breezy.tests.per_branch.test_stacking.TestStacking.test_get_set_stacked_on_relative(BzrBranchFormat5)
 breezy.tests.per_branch.test_stacking.TestStacking.test_get_set_stacked_on_relative(BzrBranchFormat6)
 breezy.tests.per_branch.test_stacking.TestStacking.test_get_set_stacked_on_url(BranchReferenceFormat)
+breezy.tests.per_branch.test_stacking.TestStacking.test_get_set_stacked_on_url(BzrBranchFormat4)
 breezy.tests.per_branch.test_stacking.TestStacking.test_get_set_stacked_on_url(BzrBranchFormat5)
 breezy.tests.per_branch.test_stacking.TestStacking.test_get_set_stacked_on_url(BzrBranchFormat6)
 breezy.tests.per_branch.test_stacking.TestStacking.test_no_op_preserve_stacking(BranchReferenceFormat)
@@ -817,9 +927,11 @@
 breezy.tests.per_branch.test_stacking.TestStacking.test_pull_delta_when_stacked(BzrBranchFormat6)
 breezy.tests.per_branch.test_stacking.TestStacking.test_revision_history_of_stacked(BranchReferenceFormat)
 breezy.tests.per_branch.test_stacking.TestStacking.test_set_stacked_on_same_branch_after_being_stacked_raises(BranchReferenceFormat)
+breezy.tests.per_branch.test_stacking.TestStacking.test_set_stacked_on_same_branch_after_being_stacked_raises(BzrBranchFormat4)
 breezy.tests.per_branch.test_stacking.TestStacking.test_set_stacked_on_same_branch_after_being_stacked_raises(BzrBranchFormat5)
 breezy.tests.per_branch.test_stacking.TestStacking.test_set_stacked_on_same_branch_after_being_stacked_raises(BzrBranchFormat6)
 breezy.tests.per_branch.test_stacking.TestStacking.test_set_stacked_on_same_branch_raises(BranchReferenceFormat)
+breezy.tests.per_branch.test_stacking.TestStacking.test_set_stacked_on_same_branch_raises(BzrBranchFormat4)
 breezy.tests.per_branch.test_stacking.TestStacking.test_set_stacked_on_same_branch_raises(BzrBranchFormat5)
 breezy.tests.per_branch.test_stacking.TestStacking.test_set_stacked_on_same_branch_raises(BzrBranchFormat6)
 breezy.tests.per_branch.test_stacking.TestStacking.test_set_stacked_on_same_branch_raises(BzrBranchFormat7)
@@ -833,7 +945,9 @@
 breezy.tests.per_branch.test_stacking.TestStacking.test_sprout_to_smart_server_stacking_policy_handling(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_stacking.TestStacking.test_sprout_to_smart_server_stacking_policy_handling(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_stacking.TestStacking.test_stack_on_repository_branch(BranchReferenceFormat)
+breezy.tests.per_branch.test_stacking.TestStacking.test_stack_on_repository_branch(BzrBranchFormat4)
 breezy.tests.per_branch.test_stacking.TestStacking.test_transform_fallback_location_hook(BranchReferenceFormat)
+breezy.tests.per_branch.test_stacking.TestStacking.test_transform_fallback_location_hook(BzrBranchFormat4)
 breezy.tests.per_branch.test_stacking.TestStacking.test_transform_fallback_location_hook(BzrBranchFormat5)
 breezy.tests.per_branch.test_stacking.TestStacking.test_transform_fallback_location_hook(BzrBranchFormat6)
 breezy.tests.per_branch.test_stacking.TestStacking.test_unstack_already_locked(BranchReferenceFormat)
@@ -844,70 +958,98 @@
 breezy.tests.per_branch.test_tags.AutomaticTagNameTests.test_returns_tag_name(BranchReferenceFormat)
 breezy.tests.per_branch.test_tags.AutomaticTagNameTests.test_uses_first_return(BranchReferenceFormat)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_cached_tag_dict_not_accidentally_mutable(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_cached_tag_dict_not_accidentally_mutable(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_cached_tag_dict_not_accidentally_mutable(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_delete_tag(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_delete_tag(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_delete_tag(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_delete_tag_invalides_cache(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_delete_tag_invalides_cache(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_delete_tag_invalides_cache(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_ghost_tag(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_ghost_tag(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_ghost_tag(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_make_and_lookup_tag(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_make_and_lookup_tag(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_make_and_lookup_tag(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_merge_empty_tags(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_merge_empty_tags(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_merge_empty_tags(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_merge_tags(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_merge_tags(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_merge_tags(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_merge_to_invalides_cache(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_merge_to_invalides_cache(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_merge_to_invalides_cache(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_no_such_tag(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_no_such_tag(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_no_such_tag(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_read_lock_caches_tags(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_read_lock_caches_tags(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_read_lock_caches_tags(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_rename_revisions_invalides_cache(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_rename_revisions_invalides_cache(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_rename_revisions_invalides_cache(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_reverse_tag_dict(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_reverse_tag_dict(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_reverse_tag_dict(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_set_tag_invalides_cache(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_set_tag_invalides_cache(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_set_tag_invalides_cache(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_tags_initially_empty(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_tags_initially_empty(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_tags_initially_empty(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_unicode_tag(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_unicode_tag(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_unicode_tag(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_unlocked_does_not_cache_tags(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_unlocked_does_not_cache_tags(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_unlocked_does_not_cache_tags(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_ignore_master_disables_tag_propagation(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_ignore_master_disables_tag_propagation(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_ignore_master_disables_tag_propagation(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_conflict_in_child_only(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_conflict_in_child_only(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_conflict_in_child_only(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_conflict_in_master_only(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_conflict_in_master_only(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_conflict_in_master_only(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_different_conflict_in_master_and_child(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_different_conflict_in_master_and_child(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_different_conflict_in_master_and_child(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_overwrite_conflict_in_child_and_master(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_overwrite_conflict_in_child_and_master(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_overwrite_conflict_in_child_and_master(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_overwrite_conflict_in_master(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_overwrite_conflict_in_master(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_overwrite_conflict_in_master(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_propagates_tags(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_propagates_tags(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_propagates_tags(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_same_conflict_in_master_and_child(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_same_conflict_in_master_and_child(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_same_conflict_in_master_and_child(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_merge_empty_tags(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_merge_empty_tags(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_merge_empty_tags(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_merge_empty_tags(BzrBranchFormat6)
 breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_merge_empty_tags(BzrBranchFormat7)
 breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_merge_empty_tags(BzrBranchFormat8)
 breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_tag_methods_raise(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_tag_methods_raise(BzrBranchFormat4)
 breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_tag_methods_raise(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_tag_methods_raise(BzrBranchFormat6)
 breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_tag_methods_raise(BzrBranchFormat7)
 breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_tag_methods_raise(BzrBranchFormat8)
 breezy.tests.per_branch.test_uncommit.TestUncommitHook.test_post_uncommit_bound(BranchReferenceFormat)
+breezy.tests.per_branch.test_uncommit.TestUncommitHook.test_post_uncommit_bound(BzrBranchFormat4)
 breezy.tests.per_branch.test_uncommit.TestUncommitHook.test_post_uncommit_not_to_origin(BranchReferenceFormat)
 breezy.tests.per_branch.test_uncommit.TestUncommitHook.test_post_uncommit_to_origin(BranchReferenceFormat)
 breezy.tests.per_branch.test_update.TestUpdate.test_update_in_checkout_of_readonly(BranchReferenceFormat)
 breezy.tests.per_branch.test_update.TestUpdate.test_update_local_commits_returns_old_tip(BranchReferenceFormat)
 breezy.tests.per_branch.test_update.TestUpdate.test_update_prefix_returns_none(BranchReferenceFormat)
 breezy.tests.per_branch.test_update.TestUpdate.test_update_unbound_works(BranchReferenceFormat)
+breezy.tests.per_branch.test_update.TestUpdate.test_update_unbound_works(BzrBranchFormat4)
 breezy.tests.per_branch.test_update.TestUpdate.test_update_unbound_works(BzrBranchFormat5)
 breezy.tests.per_branch.test_update.TestUpdate.test_update_unbound_works(BzrBranchFormat6)
 breezy.tests.per_branch.test_update.TestUpdate.test_update_unbound_works(BzrBranchFormat7)
@@ -916,6 +1058,9 @@
 breezy.tests.per_interbranch.test_get.TestInterBranchGet.test_gets_right_inter(GenericInterBranch,BzrBranchFormat7,BzrBranchFormat7)
 breezy.tests.per_interrepository.test_fetch.TestFetchDependentData.test_reference(InterDifferingSerializer,RepositoryFormat2a,RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_interrepository.test_fetch.TestFetchDependentData.test_reference(InterDifferingSerializer,RepositoryFormatKnitPack6RichRoot,RepositoryFormat2a)
+breezy.tests.per_interrepository.test_fetch.TestFetchDependentData.test_reference(InterKnitRepo,RepositoryFormatKnit1,RepositoryFormatKnit1)
+breezy.tests.per_interrepository.test_fetch.TestFetchDependentData.test_reference(InterKnitRepo,RepositoryFormatKnit1,RepositoryFormatKnitPack1)
+breezy.tests.per_interrepository.test_fetch.TestFetchDependentData.test_reference(InterRepository,RepositoryFormatKnit1,RepositoryFormatKnit3)
 breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_across_stacking_boundary_ignores_ghost(InterKnitRepo,RepositoryFormatKnit1,RepositoryFormatKnit1)
 breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_across_stacking_boundary_ignores_ghost(InterKnitRepo,RepositoryFormatKnit1,RepositoryFormatKnitPack1)
 breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_across_stacking_boundary_ignores_ghost(InterKnitRepo,RepositoryFormatKnit3,RepositoryFormatKnitPack3)
@@ -1000,9 +1145,16 @@
 breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_same_location_trivial_works(InterDifferingSerializer,RepositoryFormat2a,RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_same_location_trivial_works(InterDifferingSerializer,RepositoryFormatKnitPack1,RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_same_location_trivial_works(InterDifferingSerializer,RepositoryFormatKnitPack6RichRoot,RepositoryFormat2a)
+breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_same_location_trivial_works(InterKnitRepo,RepositoryFormatKnit1,RepositoryFormatKnit1)
+breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_same_location_trivial_works(InterKnitRepo,RepositoryFormatKnit1,RepositoryFormatKnitPack1)
+breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_same_location_trivial_works(InterKnitRepo,RepositoryFormatKnit3,RepositoryFormatKnitPack3)
 breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_same_location_trivial_works(InterKnitRepo,RepositoryFormatKnitPack1,RepositoryFormatKnit1)
 breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_same_location_trivial_works(InterKnitRepo,RepositoryFormatKnitPack3,RepositoryFormatKnit3)
 breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_same_location_trivial_works(InterKnitRepo,RepositoryFormatKnitPack3,RepositoryFormatKnitPack4)
+breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_same_location_trivial_works(InterRepository,RepositoryFormat5,RepositoryFormatKnit3)
+breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_same_location_trivial_works(InterRepository,RepositoryFormatKnit1,RepositoryFormatKnit3)
+breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_same_location_trivial_works(InterSameDataRepository,RepositoryFormatKnit3,RepositoryFormatKnit3)
+breezy.tests.per_interrepository.test_interrepository.TestCaseWithGhosts.test_fetch_all_fixes_up_ghost(InterRepository,RepositoryFormat5,RepositoryFormatKnit3)
 breezy.tests.per_interrepository.test_interrepository.TestInterRepository.test_interrepository_get_returns_correct_optimiser(InterDifferingSerializer+get_known_graph_ancestry,RepositoryFormatKnitPack1,RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_interrepository.test_interrepository.TestInterRepository.test_interrepository_get_returns_correct_optimiser(InterDifferingSerializer,RepositoryFormat2a,RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_interrepository.test_interrepository.TestInterRepository.test_interrepository_get_returns_correct_optimiser(InterDifferingSerializer,RepositoryFormatKnitPack1,RepositoryFormatKnitPack6RichRoot)
@@ -1016,9 +1168,26 @@
 breezy.tests.per_interrepository.test_interrepository.TestInterRepository.test_interrepository_get_returns_correct_optimiser(InterRepository,RepositoryFormat5,RepositoryFormatKnit3)
 breezy.tests.per_interrepository.test_interrepository.TestInterRepository.test_interrepository_get_returns_correct_optimiser(InterRepository,RepositoryFormatKnit1,RepositoryFormatKnit3)
 breezy.tests.per_interrepository.test_interrepository.TestInterRepository.test_interrepository_get_returns_correct_optimiser(InterSameDataRepository,RepositoryFormatKnit3,RepositoryFormatKnit3)
+breezy.tests.per_intertree.test_compare.TestCompare.test_abc_content_to_empty(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestCompare.test_compare_empty_trees(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestCompare.test_dangling(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestCompare.test_default_ignores_unversioned_files(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content_a_and_c_only(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content_a_only(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content_b_only(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content_c_only(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestCompare.test_require_versioned(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestCompare.test_unversioned_paths_in_tree(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_compare_empty_trees(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_compare_subtrees(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_compare_subtrees(InterTree)
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_compare_subtrees(InterTree(CHKInventory))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_compare_subtrees(InterTree(PreviewTree))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_default_ignores_unversioned_files(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_renamed_and_added(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_renamed_and_unknown(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_trees_with_special_names(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_paths_in_tree(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_paths_in_tree_specific_files(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_subtree_only_emits_root(InterDirStateTree(C))
@@ -1140,6 +1309,12 @@
 breezy.tests.per_repository_chk.test_supported.TestCHKSupport.test_chk_bytes_attribute_is_VersionedFiles(RepositoryFormat2a)
 breezy.tests.per_repository_chk.test_supported.TestCHKSupport.test_chk_bytes_attribute_is_VersionedFiles(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_chk.test_unsupported.TestNoCHKSupport.test_chk_bytes_attribute_is_None(RepositoryFormat4)
+breezy.tests.per_repository_chk.test_unsupported.TestNoCHKSupport.test_chk_bytes_attribute_is_None(RepositoryFormat5)
+breezy.tests.per_repository_chk.test_unsupported.TestNoCHKSupport.test_chk_bytes_attribute_is_None(RepositoryFormat6)
+breezy.tests.per_repository_chk.test_unsupported.TestNoCHKSupport.test_chk_bytes_attribute_is_None(RepositoryFormat7)
+breezy.tests.per_repository_chk.test_unsupported.TestNoCHKSupport.test_chk_bytes_attribute_is_None(RepositoryFormatKnit1)
+breezy.tests.per_repository_chk.test_unsupported.TestNoCHKSupport.test_chk_bytes_attribute_is_None(RepositoryFormatKnit3)
+breezy.tests.per_repository_chk.test_unsupported.TestNoCHKSupport.test_chk_bytes_attribute_is_None(RepositoryFormatKnit4)
 breezy.tests.per_repository_chk.test_unsupported.TestNoCHKSupport.test_chk_bytes_attribute_is_None(RepositoryFormatKnitPack1)
 breezy.tests.per_repository_chk.test_unsupported.TestNoCHKSupport.test_chk_bytes_attribute_is_None(RepositoryFormatKnitPack3)
 breezy.tests.per_repository_chk.test_unsupported.TestNoCHKSupport.test_chk_bytes_attribute_is_None(RepositoryFormatKnitPack4)
@@ -1206,21 +1381,42 @@
 breezy.tests.per_repository_reference.TestIncompatibleStacking.test_add_fallback_repository_rejects_incompatible(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_reference.TestIncompatibleStacking.test_add_fallback_repository_rejects_incompatible(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_reference.TestIncompatibleStacking.test_add_fallback_repository_rejects_incompatible(RepositoryFormatPackDevelopment2Subtree)
+breezy.tests.per_repository_reference.test_initialize.TestInitialize.test_initialize_on_transport_ex(RepositoryFormat2a)
+breezy.tests.per_repository_reference.test_initialize.TestInitialize.test_initialize_on_transport_ex(RepositoryFormat2aSubtree)
+breezy.tests.per_repository_reference.test_initialize.TestInitialize.test_initialize_on_transport_ex(RepositoryFormatKnitPack6)
+breezy.tests.per_repository_reference.test_initialize.TestInitialize.test_initialize_on_transport_ex(RepositoryFormatKnitPack6RichRoot)
+breezy.tests.per_repository_reference.test_initialize.TestInitialize.test_initialize_on_transport_ex(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository_reference.test_unlock.TestUnlock.test_unlock_unlocks_fallback(RepositoryFormat2a)
 breezy.tests.per_repository_reference.test_unlock.TestUnlock.test_unlock_unlocks_fallback(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_reference.test_unlock.TestUnlock.test_unlock_unlocks_fallback(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_reference.test_unlock.TestUnlock.test_unlock_unlocks_fallback(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_reference.test_unlock.TestUnlock.test_unlock_unlocks_fallback(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_add_fallback_repository.TestAddFallbackRepository.test_add_fallback_repository(RepositoryFormat4)
+breezy.tests.per_repository.test_add_fallback_repository.TestAddFallbackRepository.test_add_fallback_repository(RepositoryFormat7)
+breezy.tests.per_repository.test_add_fallback_repository.TestAddFallbackRepository.test_add_fallback_repository(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_add_fallback_repository.TestAddFallbackRepository.test_add_fallback_repository(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_add_fallback_repository.TestAddFallbackRepository.test_add_fallback_repository(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_break_lock.TestBreakLock.test_locked(RepositoryFormat2a)
 breezy.tests.per_repository.test_break_lock.TestBreakLock.test_locked(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_break_lock.TestBreakLock.test_locked(RepositoryFormat4)
+breezy.tests.per_repository.test_break_lock.TestBreakLock.test_locked(RepositoryFormat5)
+breezy.tests.per_repository.test_break_lock.TestBreakLock.test_locked(RepositoryFormat6)
+breezy.tests.per_repository.test_break_lock.TestBreakLock.test_locked(RepositoryFormat7)
+breezy.tests.per_repository.test_break_lock.TestBreakLock.test_locked(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_break_lock.TestBreakLock.test_locked(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_break_lock.TestBreakLock.test_locked(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_break_lock.TestBreakLock.test_locked(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_break_lock.TestBreakLock.test_locked(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_break_lock.TestBreakLock.test_locked(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_break_lock.TestBreakLock.test_unlocked(RepositoryFormat2a)
 breezy.tests.per_repository.test_break_lock.TestBreakLock.test_unlocked(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_break_lock.TestBreakLock.test_unlocked(RepositoryFormat4)
+breezy.tests.per_repository.test_break_lock.TestBreakLock.test_unlocked(RepositoryFormat5)
+breezy.tests.per_repository.test_break_lock.TestBreakLock.test_unlocked(RepositoryFormat6)
+breezy.tests.per_repository.test_break_lock.TestBreakLock.test_unlocked(RepositoryFormat7)
+breezy.tests.per_repository.test_break_lock.TestBreakLock.test_unlocked(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_break_lock.TestBreakLock.test_unlocked(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_break_lock.TestBreakLock.test_unlocked(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_break_lock.TestBreakLock.test_unlocked(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_break_lock.TestBreakLock.test_unlocked(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_break_lock.TestBreakLock.test_unlocked(RepositoryFormatKnitPack4)
@@ -1237,6 +1433,12 @@
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_builder_commit_with_invalid_message(RepositoryFormat2a)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_builder_commit_with_invalid_message(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_builder_commit_with_invalid_message(RepositoryFormat4)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_builder_commit_with_invalid_message(RepositoryFormat5)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_builder_commit_with_invalid_message(RepositoryFormat6)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_builder_commit_with_invalid_message(RepositoryFormat7)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_builder_commit_with_invalid_message(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_builder_commit_with_invalid_message(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_builder_commit_with_invalid_message(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_builder_commit_with_invalid_message(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_builder_commit_with_invalid_message(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_builder_commit_with_invalid_message(RepositoryFormatPackDevelopment2Subtree)
@@ -1247,6 +1449,10 @@
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_without_root_errors(RepositoryFormat2a)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_without_root_errors(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_without_root_errors(RepositoryFormat4)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_without_root_errors(RepositoryFormat7)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_without_root_errors(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_without_root_errors(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_without_root_errors(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_without_root_errors(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_without_root_errors(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_without_root_errors(RepositoryFormatPackDevelopment2Subtree)
@@ -1255,12 +1461,24 @@
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder(RepositoryFormat2a)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder(RepositoryFormat4)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder(RepositoryFormat5)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder(RepositoryFormat6)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder(RepositoryFormat7)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder_with_invalid_revprops(RepositoryFormat2a)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder_with_invalid_revprops(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder_with_invalid_revprops(RepositoryFormat4)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder_with_invalid_revprops(RepositoryFormat5)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder_with_invalid_revprops(RepositoryFormat6)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder_with_invalid_revprops(RepositoryFormat7)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder_with_invalid_revprops(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder_with_invalid_revprops(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder_with_invalid_revprops(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder_with_invalid_revprops(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder_with_invalid_revprops(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_get_commit_builder_with_invalid_revprops(RepositoryFormatPackDevelopment2Subtree)
@@ -1302,6 +1520,15 @@
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_stacked_repositories_reject_commit_builder(RepositoryFormat2a)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_stacked_repositories_reject_commit_builder(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_stacked_repositories_reject_commit_builder(RepositoryFormat4)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_stacked_repositories_reject_commit_builder(RepositoryFormat5)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_stacked_repositories_reject_commit_builder(RepositoryFormat6)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_stacked_repositories_reject_commit_builder(RepositoryFormat7)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_stacked_repositories_reject_commit_builder(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_stacked_repositories_reject_commit_builder(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_stacked_repositories_reject_commit_builder(RepositoryFormatKnit4)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_stacked_repositories_reject_commit_builder(RepositoryFormatKnitPack1)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_stacked_repositories_reject_commit_builder(RepositoryFormatKnitPack3)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_stacked_repositories_reject_commit_builder(RepositoryFormatKnitPack4)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_stacked_repositories_reject_commit_builder(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_stacked_repositories_reject_commit_builder(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_stacked_repositories_reject_commit_builder(RepositoryFormatPackDevelopment2Subtree)
@@ -1312,6 +1539,12 @@
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_fails_in_write_group(RepositoryFormat2a)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_fails_in_write_group(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_fails_in_write_group(RepositoryFormat4)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_fails_in_write_group(RepositoryFormat5)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_fails_in_write_group(RepositoryFormat6)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_fails_in_write_group(RepositoryFormat7)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_fails_in_write_group(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_fails_in_write_group(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_fails_in_write_group(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_fails_in_write_group(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_fails_in_write_group(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_fails_in_write_group(RepositoryFormatPackDevelopment2Subtree)
@@ -1326,38 +1559,71 @@
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_ghost_parent(RepositoryFormat5)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_ghost_parent(RepositoryFormat6)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_ghost_parent(RepositoryFormat7)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_ghost_parent(RepositoryFormatKnit1)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_ghost_parent(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_ghost_parent(RepositoryFormatKnitPack5)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_ghost_parent(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent_different_id_gone(RepositoryFormat4)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent_different_id_gone(RepositoryFormat5)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent_different_id_gone(RepositoryFormat6)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent_different_id_gone(RepositoryFormat7)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent_different_id_gone(RepositoryFormatKnit1)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent_different_id_gone(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent_different_id_gone(RepositoryFormatKnitPack5)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent_different_id_gone(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent_different_id_moved(RepositoryFormat4)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent_different_id_moved(RepositoryFormat5)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent_different_id_moved(RepositoryFormat6)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent_different_id_moved(RepositoryFormat7)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent_different_id_moved(RepositoryFormatKnit1)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent_different_id_moved(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent_different_id_moved(RepositoryFormatKnitPack5)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent_different_id_moved(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent(RepositoryFormat4)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent(RepositoryFormat5)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent(RepositoryFormat6)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent(RepositoryFormat7)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent(RepositoryFormatKnit1)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent(RepositoryFormatKnitPack5)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_1_parent(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_head_parents(RepositoryFormat4)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_head_parents(RepositoryFormat5)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_head_parents(RepositoryFormat6)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_head_parents(RepositoryFormat7)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_head_parents(RepositoryFormatKnit1)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_head_parents(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_head_parents(RepositoryFormatKnitPack5)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_head_parents(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parent_1_different_id_gone(RepositoryFormat4)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parent_1_different_id_gone(RepositoryFormat5)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parent_1_different_id_gone(RepositoryFormat6)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parent_1_different_id_gone(RepositoryFormat7)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parent_1_different_id_gone(RepositoryFormatKnit1)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parent_1_different_id_gone(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parent_1_different_id_gone(RepositoryFormatKnitPack5)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parent_1_different_id_gone(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parent_2_different_id_moved(RepositoryFormat4)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parent_2_different_id_moved(RepositoryFormat5)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parent_2_different_id_moved(RepositoryFormat6)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parent_2_different_id_moved(RepositoryFormat7)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parent_2_different_id_moved(RepositoryFormatKnit1)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parent_2_different_id_moved(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parent_2_different_id_moved(RepositoryFormatKnitPack5)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parent_2_different_id_moved(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parents_1_head(RepositoryFormat4)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parents_1_head(RepositoryFormat5)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parents_1_head(RepositoryFormat6)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parents_1_head(RepositoryFormat7)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parents_1_head(RepositoryFormatKnit1)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parents_1_head(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parents_1_head(RepositoryFormatKnitPack5)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_2_parents_1_head(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_no_parents(RepositoryFormat4)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_no_parents(RepositoryFormat5)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_no_parents(RepositoryFormat6)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_no_parents(RepositoryFormat7)
+breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_no_parents(RepositoryFormatKnit1)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_no_parents(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_no_parents(RepositoryFormatKnitPack5)
 breezy.tests.per_repository.test_fetch.TestFetchSameRepository.test_fetch_to_rich_root_set_parent_no_parents(RepositoryFormatKnitPack6)
@@ -1371,6 +1637,9 @@
 breezy.tests.per_repository.test_get_parent_map.TestGetParentMap.test_missing_revision(RepositoryFormat2a)
 breezy.tests.per_repository.test_get_parent_map.TestGetParentMap.test_missing_revision(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_get_parent_map.TestGetParentMap.test_missing_revision(RepositoryFormat4)
+breezy.tests.per_repository.test_get_parent_map.TestGetParentMap.test_missing_revision(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_get_parent_map.TestGetParentMap.test_missing_revision(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_get_parent_map.TestGetParentMap.test_missing_revision(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_get_parent_map.TestGetParentMap.test_missing_revision(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_get_parent_map.TestGetParentMap.test_missing_revision(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_get_parent_map.TestGetParentMap.test_missing_revision(RepositoryFormatPackDevelopment2Subtree)
@@ -1380,24 +1649,46 @@
 breezy.tests.per_repository.test_get_parent_map.TestGetParentMap.test_null_revision(RepositoryFormat2a)
 breezy.tests.per_repository.test_get_parent_map.TestGetParentMap.test_null_revision(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_get_parent_map.TestGetParentMap.test_null_revision(RepositoryFormat4)
+breezy.tests.per_repository.test_get_parent_map.TestGetParentMap.test_null_revision(RepositoryFormat7)
+breezy.tests.per_repository.test_get_parent_map.TestGetParentMap.test_null_revision(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_get_parent_map.TestGetParentMap.test_null_revision(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_get_parent_map.TestGetParentMap.test_null_revision(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_get_parent_map.TestGetParentMap.test_null_revision(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_get_parent_map.TestGetParentMap.test_null_revision(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_get_parent_map.TestGetParentMap.test_null_revision(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_empty_list(RepositoryFormat2a)
 breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_empty_list(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_empty_list(RepositoryFormat4)
+breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_empty_list(RepositoryFormat5)
+breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_empty_list(RepositoryFormat6)
+breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_empty_list(RepositoryFormat7)
+breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_empty_list(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_empty_list(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_empty_list(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_empty_list(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_empty_list(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_empty_list(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_NULL(RepositoryFormat2a)
 breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_NULL(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_NULL(RepositoryFormat4)
+breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_NULL(RepositoryFormat6)
+breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_NULL(RepositoryFormat7)
+breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_NULL(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_NULL(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_NULL(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_NULL(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_NULL(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_NULL(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_has_revisions.TestHasRevisions.test_superset(RepositoryFormat4)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_format_not_equal(RepositoryFormat2a)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_format_not_equal(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_format_not_equal(RepositoryFormat4)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_format_not_equal(RepositoryFormat5)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_format_not_equal(RepositoryFormat6)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_format_not_equal(RepositoryFormat7)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_format_not_equal(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_format_not_equal(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_format_not_equal(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_format_not_equal(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_format_not_equal(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_format_not_equal(RepositoryFormatKnitPack4)
@@ -1410,6 +1701,12 @@
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_repos_not_equal(RepositoryFormat2a)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_repos_not_equal(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_repos_not_equal(RepositoryFormat4)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_repos_not_equal(RepositoryFormat5)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_repos_not_equal(RepositoryFormat6)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_repos_not_equal(RepositoryFormat7)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_repos_not_equal(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_repos_not_equal(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_repos_not_equal(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_repos_not_equal(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_repos_not_equal(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_different_repos_not_equal(RepositoryFormatKnitPack4)
@@ -1422,6 +1719,12 @@
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_bzrdir_different_control_files_not_equal(RepositoryFormat2a)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_bzrdir_different_control_files_not_equal(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_bzrdir_different_control_files_not_equal(RepositoryFormat4)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_bzrdir_different_control_files_not_equal(RepositoryFormat5)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_bzrdir_different_control_files_not_equal(RepositoryFormat6)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_bzrdir_different_control_files_not_equal(RepositoryFormat7)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_bzrdir_different_control_files_not_equal(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_bzrdir_different_control_files_not_equal(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_bzrdir_different_control_files_not_equal(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_bzrdir_different_control_files_not_equal(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_bzrdir_different_control_files_not_equal(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_bzrdir_different_control_files_not_equal(RepositoryFormatKnitPack4)
@@ -1434,6 +1737,12 @@
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_instance(RepositoryFormat2a)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_instance(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_instance(RepositoryFormat4)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_instance(RepositoryFormat5)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_instance(RepositoryFormat6)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_instance(RepositoryFormat7)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_instance(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_instance(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_instance(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_instance(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_instance(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_instance(RepositoryFormatKnitPack4)
@@ -1446,6 +1755,12 @@
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_location(RepositoryFormat2a)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_location(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_location(RepositoryFormat4)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_location(RepositoryFormat5)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_location(RepositoryFormat6)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_location(RepositoryFormat7)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_location(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_location(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_location(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_location(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_location(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_has_same_location.TestHasSameLocation.test_same_repo_location(RepositoryFormatKnitPack4)
@@ -1458,6 +1773,12 @@
 breezy.tests.per_repository.test_locking.TestIsLocked.test_not_locked(RepositoryFormat2a)
 breezy.tests.per_repository.test_locking.TestIsLocked.test_not_locked(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_locking.TestIsLocked.test_not_locked(RepositoryFormat4)
+breezy.tests.per_repository.test_locking.TestIsLocked.test_not_locked(RepositoryFormat5)
+breezy.tests.per_repository.test_locking.TestIsLocked.test_not_locked(RepositoryFormat6)
+breezy.tests.per_repository.test_locking.TestIsLocked.test_not_locked(RepositoryFormat7)
+breezy.tests.per_repository.test_locking.TestIsLocked.test_not_locked(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_locking.TestIsLocked.test_not_locked(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_locking.TestIsLocked.test_not_locked(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_locking.TestIsLocked.test_not_locked(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_locking.TestIsLocked.test_not_locked(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_locking.TestIsLocked.test_not_locked(RepositoryFormatKnitPack4)
@@ -1470,18 +1791,36 @@
 breezy.tests.per_repository.test_locking.TestIsLocked.test_read_locked(RepositoryFormat2a)
 breezy.tests.per_repository.test_locking.TestIsLocked.test_read_locked(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_locking.TestIsLocked.test_read_locked(RepositoryFormat4)
+breezy.tests.per_repository.test_locking.TestIsLocked.test_read_locked(RepositoryFormat5)
+breezy.tests.per_repository.test_locking.TestIsLocked.test_read_locked(RepositoryFormat6)
+breezy.tests.per_repository.test_locking.TestIsLocked.test_read_locked(RepositoryFormat7)
+breezy.tests.per_repository.test_locking.TestIsLocked.test_read_locked(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_locking.TestIsLocked.test_read_locked(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_locking.TestIsLocked.test_read_locked(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_locking.TestIsLocked.test_read_locked(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_locking.TestIsLocked.test_read_locked(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_locking.TestIsLocked.test_read_locked(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_locking.TestIsLocked.test_write_locked(RepositoryFormat2a)
 breezy.tests.per_repository.test_locking.TestIsLocked.test_write_locked(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_locking.TestIsLocked.test_write_locked(RepositoryFormat4)
+breezy.tests.per_repository.test_locking.TestIsLocked.test_write_locked(RepositoryFormat5)
+breezy.tests.per_repository.test_locking.TestIsLocked.test_write_locked(RepositoryFormat6)
+breezy.tests.per_repository.test_locking.TestIsLocked.test_write_locked(RepositoryFormat7)
+breezy.tests.per_repository.test_locking.TestIsLocked.test_write_locked(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_locking.TestIsLocked.test_write_locked(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_locking.TestIsLocked.test_write_locked(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_locking.TestIsLocked.test_write_locked(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_locking.TestIsLocked.test_write_locked(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_locking.TestIsLocked.test_write_locked(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_not_locked(RepositoryFormat2a)
 breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_not_locked(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_not_locked(RepositoryFormat4)
+breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_not_locked(RepositoryFormat5)
+breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_not_locked(RepositoryFormat6)
+breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_not_locked(RepositoryFormat7)
+breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_not_locked(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_not_locked(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_not_locked(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_not_locked(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_not_locked(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_not_locked(RepositoryFormatKnitPack4)
@@ -1494,17 +1833,35 @@
 breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_read_locked(RepositoryFormat2a)
 breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_read_locked(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_read_locked(RepositoryFormat4)
+breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_read_locked(RepositoryFormat5)
+breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_read_locked(RepositoryFormat6)
+breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_read_locked(RepositoryFormat7)
+breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_read_locked(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_read_locked(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_read_locked(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_read_locked(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_read_locked(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_read_locked(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_write_locked(RepositoryFormat2a)
 breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_write_locked(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_write_locked(RepositoryFormat4)
+breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_write_locked(RepositoryFormat5)
+breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_write_locked(RepositoryFormat6)
+breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_write_locked(RepositoryFormat7)
+breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_write_locked(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_write_locked(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_write_locked(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_write_locked(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_write_locked(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_locking.TestIsWriteLocked.test_write_locked(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_pack.TestPack.test_pack_accepts_opaque_hint(RepositoryFormat4)
 breezy.tests.per_repository.test_pack.TestPack.test_pack_empty_does_not_error(RepositoryFormat4)
+breezy.tests.per_repository.test_pack.TestPack.test_pack_empty_does_not_error(RepositoryFormat5)
+breezy.tests.per_repository.test_pack.TestPack.test_pack_empty_does_not_error(RepositoryFormat6)
+breezy.tests.per_repository.test_pack.TestPack.test_pack_empty_does_not_error(RepositoryFormat7)
+breezy.tests.per_repository.test_pack.TestPack.test_pack_empty_does_not_error(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_pack.TestPack.test_pack_empty_does_not_error(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_pack.TestPack.test_pack_empty_does_not_error(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_pack.TestPack.test_pack_empty_does_not_error(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_pack.TestPack.test_pack_empty_does_not_error(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_pack.TestPack.test_pack_empty_does_not_error(RepositoryFormatPackDevelopment2Subtree)
@@ -1512,18 +1869,36 @@
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_in_write_group(RepositoryFormat2a)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_in_write_group(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_in_write_group(RepositoryFormat4)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_in_write_group(RepositoryFormat5)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_in_write_group(RepositoryFormat6)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_in_write_group(RepositoryFormat7)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_in_write_group(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_in_write_group(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_in_write_group(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_in_write_group(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_in_write_group(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_in_write_group(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_read_locked(RepositoryFormat2a)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_read_locked(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_read_locked(RepositoryFormat4)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_read_locked(RepositoryFormat5)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_read_locked(RepositoryFormat6)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_read_locked(RepositoryFormat7)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_read_locked(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_read_locked(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_read_locked(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_read_locked(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_read_locked(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_read_locked(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_unlocked(RepositoryFormat2a)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_unlocked(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_unlocked(RepositoryFormat4)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_unlocked(RepositoryFormat5)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_unlocked(RepositoryFormat6)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_unlocked(RepositoryFormat7)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_unlocked(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_unlocked(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_unlocked(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_unlocked(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_unlocked(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_unlocked(RepositoryFormatKnitPack4)
@@ -1536,6 +1911,12 @@
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_write_locked(RepositoryFormat2a)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_write_locked(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_write_locked(RepositoryFormat4)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_write_locked(RepositoryFormat5)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_write_locked(RepositoryFormat6)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_write_locked(RepositoryFormat7)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_write_locked(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_write_locked(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_write_locked(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_write_locked(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_write_locked(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_write_locked(RepositoryFormatPackDevelopment2Subtree)
@@ -1549,6 +1930,12 @@
 breezy.tests.per_repository.test_repository.TestRepositoryControlComponent.test_urls(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepositoryControlComponent.test_urls(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepositoryControlComponent.test_urls(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepositoryControlComponent.test_urls(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepositoryControlComponent.test_urls(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepositoryControlComponent.test_urls(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepositoryControlComponent.test_urls(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepositoryControlComponent.test_urls(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepositoryControlComponent.test_urls(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepositoryControlComponent.test_urls(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepositoryControlComponent.test_urls(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepositoryControlComponent.test_urls(RepositoryFormatKnitPack4)
@@ -1561,36 +1948,70 @@
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_dont_leave_lock_in_place(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_dont_leave_lock_in_place(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_dont_leave_lock_in_place(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_dont_leave_lock_in_place(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_dont_leave_lock_in_place(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_dont_leave_lock_in_place(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_dont_leave_lock_in_place(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_dont_leave_lock_in_place(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_dont_leave_lock_in_place(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_dont_leave_lock_in_place(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_dont_leave_lock_in_place(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_dont_leave_lock_in_place(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_leave_lock_in_place(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_leave_lock_in_place(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_leave_lock_in_place(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_leave_lock_in_place(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_leave_lock_in_place(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_leave_lock_in_place(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_leave_lock_in_place(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_leave_lock_in_place(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_leave_lock_in_place(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_leave_lock_in_place(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_leave_lock_in_place(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_leave_lock_in_place(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_returns_unlockable(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_returns_unlockable(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_returns_unlockable(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_returns_unlockable(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_returns_unlockable(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_returns_unlockable(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_returns_unlockable(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_returns_unlockable(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_returns_unlockable(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_returns_unlockable(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_returns_unlockable(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_returns_unlockable(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_then_unlock(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_then_unlock(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_then_unlock(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_then_unlock(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_then_unlock(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_then_unlock(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_then_unlock(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_then_unlock(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_then_unlock(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_then_unlock(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_then_unlock(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_read_then_unlock(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_write_returns_unlockable(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_write_returns_unlockable(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_write_returns_unlockable(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_write_returns_unlockable(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_write_returns_unlockable(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_write_returns_unlockable(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_write_returns_unlockable(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_write_returns_unlockable(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_write_returns_unlockable(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_write_returns_unlockable(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_write_returns_unlockable(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_repository.TestRepositoryLocking.test_lock_write_returns_unlockable(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_repository.TestRepositoryMakeBranchAndTree.test_repository_format(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepositoryMakeBranchAndTree.test_repository_format(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepositoryMakeBranchAndTree.test_repository_format(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepositoryMakeBranchAndTree.test_repository_format(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepositoryMakeBranchAndTree.test_repository_format(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepositoryMakeBranchAndTree.test_repository_format(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepositoryMakeBranchAndTree.test_repository_format(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepositoryMakeBranchAndTree.test_repository_format(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_repository.TestRepositoryMakeBranchAndTree.test_repository_format(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_repository.TestRepositoryMakeBranchAndTree.test_repository_format(RepositoryFormatPackDevelopment2Subtree)
@@ -1598,6 +2019,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_fast_deltas(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_fast_deltas(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_fast_deltas(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_fast_deltas(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_fast_deltas(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_fast_deltas(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_fast_deltas(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_fast_deltas(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_fast_deltas(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_fast_deltas(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_fast_deltas(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_fast_deltas(RepositoryFormatKnitPack4)
@@ -1610,6 +2037,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute__fetch_reconcile(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute__fetch_reconcile(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute__fetch_reconcile(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute__fetch_reconcile(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute__fetch_reconcile(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute__fetch_reconcile(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute__fetch_reconcile(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute__fetch_reconcile(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute__fetch_reconcile(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute__fetch_reconcile(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute__fetch_reconcile(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute__fetch_reconcile(RepositoryFormatKnitPack4)
@@ -1622,6 +2055,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_experimental(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_experimental(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_experimental(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_experimental(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_experimental(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_experimental(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_experimental(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_experimental(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_experimental(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_experimental(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_experimental(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_experimental(RepositoryFormatKnitPack4)
@@ -1634,6 +2073,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_pack_compresses(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_pack_compresses(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_pack_compresses(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_pack_compresses(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_pack_compresses(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_pack_compresses(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_pack_compresses(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_pack_compresses(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_pack_compresses(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_pack_compresses(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_pack_compresses(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_pack_compresses(RepositoryFormatKnitPack4)
@@ -1646,6 +2091,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_revision_graph_can_have_wrong_parents(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_revision_graph_can_have_wrong_parents(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_revision_graph_can_have_wrong_parents(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_revision_graph_can_have_wrong_parents(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_revision_graph_can_have_wrong_parents(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_revision_graph_can_have_wrong_parents(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_revision_graph_can_have_wrong_parents(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_revision_graph_can_have_wrong_parents(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_revision_graph_can_have_wrong_parents(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_revision_graph_can_have_wrong_parents(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_revision_graph_can_have_wrong_parents(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_revision_graph_can_have_wrong_parents(RepositoryFormatKnitPack4)
@@ -1658,6 +2109,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_custom_revision_properties(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_custom_revision_properties(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_custom_revision_properties(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_custom_revision_properties(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_custom_revision_properties(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_custom_revision_properties(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_custom_revision_properties(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_custom_revision_properties(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_custom_revision_properties(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_custom_revision_properties(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_custom_revision_properties(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_custom_revision_properties(RepositoryFormatKnitPack4)
@@ -1670,6 +2127,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_full_versioned_files(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_full_versioned_files(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_full_versioned_files(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_full_versioned_files(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_full_versioned_files(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_full_versioned_files(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_full_versioned_files(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_full_versioned_files(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_full_versioned_files(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_full_versioned_files(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_full_versioned_files(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_full_versioned_files(RepositoryFormatKnitPack4)
@@ -1682,6 +2145,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_funky_characters(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_funky_characters(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_funky_characters(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_funky_characters(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_funky_characters(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_funky_characters(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_funky_characters(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_funky_characters(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_funky_characters(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_funky_characters(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_funky_characters(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_funky_characters(RepositoryFormatKnitPack4)
@@ -1694,6 +2163,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_leaving_lock(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_leaving_lock(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_leaving_lock(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_leaving_lock(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_leaving_lock(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_leaving_lock(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_leaving_lock(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_leaving_lock(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_leaving_lock(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_leaving_lock(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_leaving_lock(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_leaving_lock(RepositoryFormatKnitPack4)
@@ -1706,6 +2181,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_overriding_transport(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_overriding_transport(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_overriding_transport(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_overriding_transport(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_overriding_transport(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_overriding_transport(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_overriding_transport(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_overriding_transport(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_overriding_transport(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_overriding_transport(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_overriding_transport(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_overriding_transport(RepositoryFormatKnitPack4)
@@ -1718,6 +2199,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_setting_revision_ids(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_setting_revision_ids(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_setting_revision_ids(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_setting_revision_ids(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_setting_revision_ids(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_setting_revision_ids(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_setting_revision_ids(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_setting_revision_ids(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_setting_revision_ids(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_setting_revision_ids(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_setting_revision_ids(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_setting_revision_ids(RepositoryFormatKnitPack4)
@@ -1730,6 +2217,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_storing_branch_nick(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_storing_branch_nick(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_storing_branch_nick(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_storing_branch_nick(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_storing_branch_nick(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_storing_branch_nick(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_storing_branch_nick(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_storing_branch_nick(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_storing_branch_nick(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_storing_branch_nick(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_storing_branch_nick(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_supports_storing_branch_nick(RepositoryFormatKnitPack4)
@@ -1742,6 +2235,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_versioned_directories(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_versioned_directories(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_versioned_directories(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_versioned_directories(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_versioned_directories(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_versioned_directories(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_versioned_directories(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_versioned_directories(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_versioned_directories(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_versioned_directories(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_versioned_directories(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_format_versioned_directories(RepositoryFormatKnitPack4)
@@ -1754,6 +2253,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_nesting_repositories(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_nesting_repositories(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_nesting_repositories(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_nesting_repositories(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_nesting_repositories(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_nesting_repositories(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_nesting_repositories(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_nesting_repositories(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_nesting_repositories(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_nesting_repositories(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_nesting_repositories(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_nesting_repositories(RepositoryFormatKnitPack4)
@@ -1766,6 +2271,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_unreferenced_revisions(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_unreferenced_revisions(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_unreferenced_revisions(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_unreferenced_revisions(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_unreferenced_revisions(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_unreferenced_revisions(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_unreferenced_revisions(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_unreferenced_revisions(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_unreferenced_revisions(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_unreferenced_revisions(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_unreferenced_revisions(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_attribute_supports_unreferenced_revisions(RepositoryFormatKnitPack4)
@@ -1817,6 +2328,8 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_clone_repository_basis_revision(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_repository.TestRepository.test_clone_repository_basis_revision(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_clone_shared_no_tree(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_clone_shared_no_tree(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_clone_shared_no_tree(RepositoryFormat6)
 breezy.tests.per_repository.test_repository.TestRepository.test_clone_specific_format(RemoteRepositoryFormat-default)
 breezy.tests.per_repository.test_repository.TestRepository.test_clone_specific_format(RemoteRepositoryFormat-v2)
 breezy.tests.per_repository.test_repository.TestRepository.test_clone_specific_format(RepositoryFormat2a)
@@ -1838,6 +2351,8 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_clone_specific_format(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_repository.TestRepository.test_clone_specific_format(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_clone_stacking_policy_upgrades(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_clone_stacking_policy_upgrades(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_clone_stacking_policy_upgrades(RepositoryFormat6)
 breezy.tests.per_repository.test_repository.TestRepository.test_clone_stacking_policy_upgrades(RepositoryFormatKnitPack5RichRootBroken)
 breezy.tests.per_repository.test_repository.TestRepository.test_clone_to_default_format(RepositoryFormat4)
 breezy.tests.per_repository.test_repository.TestRepository.test_clone_to_hpss(RepositoryFormat4)
@@ -1847,18 +2362,36 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_create_repository(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_create_repository(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_create_repository(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_create_repository(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_create_repository(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_create_repository(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_create_repository(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_create_repository(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_repository.TestRepository.test_create_repository(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_repository.TestRepository.test_create_repository(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_create_repository_shared(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_create_repository_shared(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_create_repository_shared(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_create_repository_shared(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_create_repository_shared(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_create_repository_shared(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_create_repository_shared(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_create_repository_shared(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_create_repository_shared(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_repository.TestRepository.test_create_repository_shared(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_repository.TestRepository.test_create_repository_shared(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches(RepositoryFormatKnit4)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches(RepositoryFormatKnitPack1)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches(RepositoryFormatKnitPack3)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches(RepositoryFormatKnitPack4)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches(RepositoryFormatKnitPack5)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches(RepositoryFormatKnitPack5RichRoot)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches(RepositoryFormatKnitPack5RichRootBroken)
@@ -1868,6 +2401,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_empty_standalone_repo(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_empty_standalone_repo(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_empty_standalone_repo(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_empty_standalone_repo(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_empty_standalone_repo(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_empty_standalone_repo(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_empty_standalone_repo(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_empty_standalone_repo(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_empty_standalone_repo(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_empty_standalone_repo(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_empty_standalone_repo(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_empty_standalone_repo(RepositoryFormatKnitPack4)
@@ -1880,12 +2419,27 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_standalone(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_standalone(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_standalone(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_standalone(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_standalone(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_standalone(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_standalone(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_standalone(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_standalone(RepositoryFormatKnit4)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_standalone(RepositoryFormatKnitPack1)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_standalone(RepositoryFormatKnitPack3)
+breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_standalone(RepositoryFormatKnitPack4)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_standalone(RepositoryFormatKnitPack5)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_standalone(RepositoryFormatKnitPack5RichRoot)
 breezy.tests.per_repository.test_repository.TestRepository.test_find_branches_using_standalone(RepositoryFormatKnitPack5RichRootBroken)
@@ -1895,6 +2449,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_format_attributes(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_attributes(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_attributes(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_attributes(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_attributes(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_attributes(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_attributes(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_attributes(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_attributes(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_attributes(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_attributes(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_attributes(RepositoryFormatKnitPack4)
@@ -1907,6 +2467,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_format_description(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_description(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_description(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_description(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_description(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_description(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_description(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_description(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_description(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_description(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_description(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_description(RepositoryFormatKnitPack4)
@@ -1920,6 +2486,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_format_is_deprecated(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_is_deprecated(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_is_deprecated(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_is_deprecated(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_is_deprecated(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_is_deprecated(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_is_deprecated(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_is_deprecated(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_is_deprecated(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_is_deprecated(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_is_deprecated(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_is_deprecated(RepositoryFormatKnitPack4)
@@ -1932,6 +2504,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_format_is_supported(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_is_supported(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_is_supported(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_is_supported(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_is_supported(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_is_supported(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_is_supported(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_is_supported(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_is_supported(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_is_supported(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_is_supported(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_is_supported(RepositoryFormatKnitPack4)
@@ -1965,6 +2543,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_format_supports_external_lookups(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_supports_external_lookups(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_supports_external_lookups(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_supports_external_lookups(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_supports_external_lookups(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_supports_external_lookups(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_supports_external_lookups(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_supports_external_lookups(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_format_supports_external_lookups(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_supports_external_lookups(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_supports_external_lookups(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_format_supports_external_lookups(RepositoryFormatKnitPack4)
@@ -1977,6 +2561,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_get_graph(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_get_graph(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_get_graph(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_get_graph(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_get_graph(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_get_graph(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_get_graph(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_get_graph(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_get_graph(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_get_graph(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_repository.TestRepository.test_get_graph(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_repository.TestRepository.test_get_graph(RepositoryFormatPackDevelopment2Subtree)
@@ -1992,6 +2582,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_implements_revision_graph_can_have_wrong_parents(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_implements_revision_graph_can_have_wrong_parents(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_implements_revision_graph_can_have_wrong_parents(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_implements_revision_graph_can_have_wrong_parents(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_implements_revision_graph_can_have_wrong_parents(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_implements_revision_graph_can_have_wrong_parents(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_implements_revision_graph_can_have_wrong_parents(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_implements_revision_graph_can_have_wrong_parents(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_implements_revision_graph_can_have_wrong_parents(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_implements_revision_graph_can_have_wrong_parents(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_repository.TestRepository.test_implements_revision_graph_can_have_wrong_parents(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_repository.TestRepository.test_implements_revision_graph_can_have_wrong_parents(RepositoryFormatPackDevelopment2Subtree)
@@ -2000,6 +2596,12 @@
 breezy.tests.per_repository.test_repository.TestRepository.test__make_parents_provider(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test__make_parents_provider(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test__make_parents_provider(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test__make_parents_provider(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test__make_parents_provider(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test__make_parents_provider(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test__make_parents_provider(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test__make_parents_provider(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test__make_parents_provider(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test__make_parents_provider(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test__make_parents_provider(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test__make_parents_provider(RepositoryFormatKnitPack4)
@@ -2014,9 +2616,17 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_revision_tree(RepositoryFormat4)
 breezy.tests.per_repository.test_repository.TestRepository.test_root_entry_has_revision(RepositoryFormat4)
 breezy.tests.per_repository.test_repository.TestRepository.test_set_get_make_working_trees_false(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_set_get_make_working_trees_false(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_set_get_make_working_trees_false(RepositoryFormat6)
 breezy.tests.per_repository.test_repository.TestRepository.test_set_get_make_working_trees_true(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_set_get_make_working_trees_true(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_set_get_make_working_trees_true(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_set_get_make_working_trees_true(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_set_get_make_working_trees_true(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_set_get_make_working_trees_true(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_set_get_make_working_trees_true(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_set_get_make_working_trees_true(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_set_get_make_working_trees_true(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_repository.TestRepository.test_set_get_make_working_trees_true(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_repository.TestRepository.test_set_get_make_working_trees_true(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_repository.TestRepository.test_set_get_make_working_trees_true(RepositoryFormatPackDevelopment2Subtree)
@@ -2064,6 +2674,12 @@
 breezy.tests.per_repository.test_statistics.TestGatherStats.test_gather_stats_empty_repo(RepositoryFormat2a)
 breezy.tests.per_repository.test_statistics.TestGatherStats.test_gather_stats_empty_repo(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_statistics.TestGatherStats.test_gather_stats_empty_repo(RepositoryFormat4)
+breezy.tests.per_repository.test_statistics.TestGatherStats.test_gather_stats_empty_repo(RepositoryFormat5)
+breezy.tests.per_repository.test_statistics.TestGatherStats.test_gather_stats_empty_repo(RepositoryFormat6)
+breezy.tests.per_repository.test_statistics.TestGatherStats.test_gather_stats_empty_repo(RepositoryFormat7)
+breezy.tests.per_repository.test_statistics.TestGatherStats.test_gather_stats_empty_repo(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_statistics.TestGatherStats.test_gather_stats_empty_repo(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_statistics.TestGatherStats.test_gather_stats_empty_repo(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_statistics.TestGatherStats.test_gather_stats_empty_repo(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_statistics.TestGatherStats.test_gather_stats_empty_repo(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_statistics.TestGatherStats.test_gather_stats_empty_repo(RepositoryFormatPackDevelopment2Subtree)
@@ -2077,36 +2693,72 @@
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_abort_write_group_gets_None(RepositoryFormat2a)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_abort_write_group_gets_None(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_abort_write_group_gets_None(RepositoryFormat4)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_abort_write_group_gets_None(RepositoryFormat5)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_abort_write_group_gets_None(RepositoryFormat6)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_abort_write_group_gets_None(RepositoryFormat7)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_abort_write_group_gets_None(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_abort_write_group_gets_None(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_abort_write_group_gets_None(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_abort_write_group_gets_None(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_abort_write_group_gets_None(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_abort_write_group_gets_None(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_commit_write_group_does_not_error(RepositoryFormat2a)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_commit_write_group_does_not_error(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_commit_write_group_does_not_error(RepositoryFormat4)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_commit_write_group_does_not_error(RepositoryFormat5)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_commit_write_group_does_not_error(RepositoryFormat6)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_commit_write_group_does_not_error(RepositoryFormat7)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_commit_write_group_does_not_error(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_commit_write_group_does_not_error(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_commit_write_group_does_not_error(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_commit_write_group_does_not_error(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_commit_write_group_does_not_error(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_commit_write_group_does_not_error(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_is_in_write_group(RepositoryFormat2a)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_is_in_write_group(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_is_in_write_group(RepositoryFormat4)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_is_in_write_group(RepositoryFormat5)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_is_in_write_group(RepositoryFormat6)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_is_in_write_group(RepositoryFormat7)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_is_in_write_group(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_is_in_write_group(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_is_in_write_group(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_is_in_write_group(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_is_in_write_group(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_is_in_write_group(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_read_locked_needs_write_lock(RepositoryFormat2a)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_read_locked_needs_write_lock(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_read_locked_needs_write_lock(RepositoryFormat4)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_read_locked_needs_write_lock(RepositoryFormat5)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_read_locked_needs_write_lock(RepositoryFormat6)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_read_locked_needs_write_lock(RepositoryFormat7)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_read_locked_needs_write_lock(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_read_locked_needs_write_lock(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_read_locked_needs_write_lock(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_read_locked_needs_write_lock(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_read_locked_needs_write_lock(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_read_locked_needs_write_lock(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_twice_errors(RepositoryFormat2a)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_twice_errors(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_twice_errors(RepositoryFormat4)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_twice_errors(RepositoryFormat5)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_twice_errors(RepositoryFormat6)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_twice_errors(RepositoryFormat7)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_twice_errors(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_twice_errors(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_twice_errors(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_twice_errors(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_twice_errors(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_twice_errors(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_unlocked_needs_write_lock(RepositoryFormat2a)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_unlocked_needs_write_lock(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_unlocked_needs_write_lock(RepositoryFormat4)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_unlocked_needs_write_lock(RepositoryFormat5)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_unlocked_needs_write_lock(RepositoryFormat6)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_unlocked_needs_write_lock(RepositoryFormat7)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_unlocked_needs_write_lock(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_unlocked_needs_write_lock(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_unlocked_needs_write_lock(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_unlocked_needs_write_lock(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_unlocked_needs_write_lock(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_unlocked_needs_write_lock(RepositoryFormatKnitPack4)
@@ -2119,24 +2771,48 @@
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_write_locked_gets_None(RepositoryFormat2a)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_write_locked_gets_None(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_write_locked_gets_None(RepositoryFormat4)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_write_locked_gets_None(RepositoryFormat5)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_write_locked_gets_None(RepositoryFormat6)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_write_locked_gets_None(RepositoryFormat7)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_write_locked_gets_None(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_write_locked_gets_None(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_write_locked_gets_None(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_write_locked_gets_None(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_write_locked_gets_None(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_start_write_group_write_locked_gets_None(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_unlock_in_write_group(RepositoryFormat2a)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_unlock_in_write_group(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_unlock_in_write_group(RepositoryFormat4)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_unlock_in_write_group(RepositoryFormat5)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_unlock_in_write_group(RepositoryFormat6)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_unlock_in_write_group(RepositoryFormat7)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_unlock_in_write_group(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_unlock_in_write_group(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_write_group.TestWriteGroup.test_unlock_in_write_group(RepositoryFormatKnit4)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_unlock_in_write_group(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_unlock_in_write_group(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_write_group.TestWriteGroup.test_unlock_in_write_group(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_basis_missing_errors(RepositoryFormat2a)
 breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_basis_missing_errors(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_basis_missing_errors(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_basis_missing_errors(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_basis_missing_errors(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_basis_missing_errors(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_basis_missing_errors(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_basis_missing_errors(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_basis_missing_errors(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_basis_missing_errors(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_basis_missing_errors(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_basis_missing_errors(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_not_in_write_group_errors(RepositoryFormat2a)
 breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_not_in_write_group_errors(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_not_in_write_group_errors(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_not_in_write_group_errors(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_not_in_write_group_errors(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_not_in_write_group_errors(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_not_in_write_group_errors(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_not_in_write_group_errors(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_not_in_write_group_errors(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_not_in_write_group_errors(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_not_in_write_group_errors(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_vf.test_add_inventory_by_delta.TestAddInventoryByDelta.test_not_in_write_group_errors(RepositoryFormatPackDevelopment2Subtree)
@@ -2177,6 +2853,12 @@
 breezy.tests.per_repository_vf.test_check.TestFindInconsistentRevisionParents.test__check_for_inconsistent_revision_parents_on_clean_repo(RepositoryFormat2a)
 breezy.tests.per_repository_vf.test_check.TestFindInconsistentRevisionParents.test__check_for_inconsistent_revision_parents_on_clean_repo(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_vf.test_check.TestFindInconsistentRevisionParents.test__check_for_inconsistent_revision_parents_on_clean_repo(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_check.TestFindInconsistentRevisionParents.test__check_for_inconsistent_revision_parents_on_clean_repo(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_check.TestFindInconsistentRevisionParents.test__check_for_inconsistent_revision_parents_on_clean_repo(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_check.TestFindInconsistentRevisionParents.test__check_for_inconsistent_revision_parents_on_clean_repo(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_check.TestFindInconsistentRevisionParents.test__check_for_inconsistent_revision_parents_on_clean_repo(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_check.TestFindInconsistentRevisionParents.test__check_for_inconsistent_revision_parents_on_clean_repo(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_check.TestFindInconsistentRevisionParents.test__check_for_inconsistent_revision_parents_on_clean_repo(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_check.TestFindInconsistentRevisionParents.test__check_for_inconsistent_revision_parents_on_clean_repo(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_vf.test_check.TestFindInconsistentRevisionParents.test__check_for_inconsistent_revision_parents_on_clean_repo(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_vf.test_check.TestFindInconsistentRevisionParents.test__check_for_inconsistent_revision_parents_on_clean_repo(RepositoryFormatPackDevelopment2Subtree)
@@ -2235,6 +2917,15 @@
 breezy.tests.per_repository_vf.test_fetch.TestSource.test_no_absent_records_in_stream_with_ghosts(RepositoryFormat4)
 breezy.tests.per_repository_vf.test_fileid_involved.FileIdInvolvedWGhosts.test_file_ids_include_ghosts(RepositoryFormat4)
 breezy.tests.per_repository_vf.test_fileid_involved.FileIdInvolvedWGhosts.test_file_ids_uses_fallbacks(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_fileid_involved.FileIdInvolvedWGhosts.test_file_ids_uses_fallbacks(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_fileid_involved.FileIdInvolvedWGhosts.test_file_ids_uses_fallbacks(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_fileid_involved.FileIdInvolvedWGhosts.test_file_ids_uses_fallbacks(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_fileid_involved.FileIdInvolvedWGhosts.test_file_ids_uses_fallbacks(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_fileid_involved.FileIdInvolvedWGhosts.test_file_ids_uses_fallbacks(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_fileid_involved.FileIdInvolvedWGhosts.test_file_ids_uses_fallbacks(RepositoryFormatKnit4)
+breezy.tests.per_repository_vf.test_fileid_involved.FileIdInvolvedWGhosts.test_file_ids_uses_fallbacks(RepositoryFormatKnitPack1)
+breezy.tests.per_repository_vf.test_fileid_involved.FileIdInvolvedWGhosts.test_file_ids_uses_fallbacks(RepositoryFormatKnitPack3)
+breezy.tests.per_repository_vf.test_fileid_involved.FileIdInvolvedWGhosts.test_file_ids_uses_fallbacks(RepositoryFormatKnitPack4)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolvedNonAscii.test_utf8_file_ids_and_revision_ids(RepositoryFormat4)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolvedSuperset.test_fileid_involved_full_compare2(RepositoryFormat4)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_between_two_revs(RepositoryFormat4)
@@ -2243,6 +2934,12 @@
 breezy.tests.per_repository_vf.test_find_text_key_references.TestFindTextKeyReferences.test_empty(RepositoryFormat2a)
 breezy.tests.per_repository_vf.test_find_text_key_references.TestFindTextKeyReferences.test_empty(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_vf.test_find_text_key_references.TestFindTextKeyReferences.test_empty(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_find_text_key_references.TestFindTextKeyReferences.test_empty(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_find_text_key_references.TestFindTextKeyReferences.test_empty(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_find_text_key_references.TestFindTextKeyReferences.test_empty(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_find_text_key_references.TestFindTextKeyReferences.test_empty(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_find_text_key_references.TestFindTextKeyReferences.test_empty(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_find_text_key_references.TestFindTextKeyReferences.test_empty(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_find_text_key_references.TestFindTextKeyReferences.test_empty(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_vf.test_find_text_key_references.TestFindTextKeyReferences.test_empty(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_vf.test_find_text_key_references.TestFindTextKeyReferences.test_empty(RepositoryFormatPackDevelopment2Subtree)
@@ -2269,6 +2966,9 @@
 breezy.tests.per_repository_vf.test_reconcile.TestBadRevisionParents.test_does_not_abort_on_clean_repo(RepositoryFormat2a)
 breezy.tests.per_repository_vf.test_reconcile.TestBadRevisionParents.test_does_not_abort_on_clean_repo(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_vf.test_reconcile.TestBadRevisionParents.test_does_not_abort_on_clean_repo(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_reconcile.TestBadRevisionParents.test_does_not_abort_on_clean_repo(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_reconcile.TestBadRevisionParents.test_does_not_abort_on_clean_repo(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_reconcile.TestBadRevisionParents.test_does_not_abort_on_clean_repo(RepositoryFormat7)
 breezy.tests.per_repository_vf.test_reconcile.TestBadRevisionParents.test_does_not_abort_on_clean_repo(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_vf.test_reconcile.TestBadRevisionParents.test_does_not_abort_on_clean_repo(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_vf.test_reconcile.TestBadRevisionParents.test_does_not_abort_on_clean_repo(RepositoryFormatPackDevelopment2Subtree)
@@ -2296,6 +2996,12 @@
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_order(RepositoryFormat2a)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_order(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_order(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_order(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_order(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_order(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_order(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_order(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_order(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_order(RepositoryFormatKnitPack1)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_order(RepositoryFormatKnitPack3)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_order(RepositoryFormatKnitPack4)
@@ -2308,6 +3014,12 @@
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_uses_deltas(RepositoryFormat2a)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_uses_deltas(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_uses_deltas(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_uses_deltas(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_uses_deltas(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_uses_deltas(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_uses_deltas(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_uses_deltas(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_uses_deltas(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_uses_deltas(RepositoryFormatKnitPack1)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_uses_deltas(RepositoryFormatKnitPack3)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute__fetch_uses_deltas(RepositoryFormatKnitPack4)
@@ -2321,6 +3033,10 @@
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_inventories_store(RepositoryFormat2a)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_inventories_store(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_inventories_store(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_inventories_store(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_inventories_store(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_inventories_store(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_inventories_store(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_inventories_store(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_inventories_store(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_inventories_store(RepositoryFormatPackDevelopment2Subtree)
@@ -2328,12 +3044,20 @@
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_revision_store(RepositoryFormat2a)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_revision_store(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_revision_store(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_revision_store(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_revision_store(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_revision_store(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_revision_store(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_revision_store(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_revision_store(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_revision_store(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_signature_store(RepositoryFormat2a)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_signature_store(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_signature_store(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_signature_store(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_signature_store(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_signature_store(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_signature_store(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_signature_store(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_signature_store(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_signature_store(RepositoryFormatPackDevelopment2Subtree)
@@ -2341,18 +3065,34 @@
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_text_store(RepositoryFormat2a)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_text_store(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_text_store(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_text_store(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_text_store(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_text_store(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_text_store(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_text_store(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_text_store(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_attribute_text_store(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_exposed_versioned_files_are_marked_dirty(RepositoryFormat2a)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_exposed_versioned_files_are_marked_dirty(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_exposed_versioned_files_are_marked_dirty(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_exposed_versioned_files_are_marked_dirty(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_exposed_versioned_files_are_marked_dirty(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_exposed_versioned_files_are_marked_dirty(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_exposed_versioned_files_are_marked_dirty(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_exposed_versioned_files_are_marked_dirty(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_exposed_versioned_files_are_marked_dirty(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_exposed_versioned_files_are_marked_dirty(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_exposed_versioned_files_are_marked_dirty(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_exposed_versioned_files_are_marked_dirty(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_get_serializer_format(RepositoryFormat2a)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_get_serializer_format(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_get_serializer_format(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_get_serializer_format(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_get_serializer_format(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_get_serializer_format(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_get_serializer_format(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_get_serializer_format(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test_get_serializer_format(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_get_serializer_format(RepositoryFormatKnitPack1)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_get_serializer_format(RepositoryFormatKnitPack3)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test_get_serializer_format(RepositoryFormatKnitPack4)
@@ -2365,6 +3105,12 @@
 breezy.tests.per_repository_vf.test_repository.TestRepository.test__get_sink(RepositoryFormat2a)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test__get_sink(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test__get_sink(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test__get_sink(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test__get_sink(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test__get_sink(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test__get_sink(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test__get_sink(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_repository.TestRepository.test__get_sink(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test__get_sink(RepositoryFormatKnitPack1)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test__get_sink(RepositoryFormatKnitPack3)
 breezy.tests.per_repository_vf.test_repository.TestRepository.test__get_sink(RepositoryFormatKnitPack4)
@@ -2380,25 +3126,55 @@
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_empty_get_missing_parent_inventories(RepositoryFormat2a)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_empty_get_missing_parent_inventories(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_empty_get_missing_parent_inventories(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_empty_get_missing_parent_inventories(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_empty_get_missing_parent_inventories(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_empty_get_missing_parent_inventories(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_empty_get_missing_parent_inventories(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_empty_get_missing_parent_inventories(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_empty_get_missing_parent_inventories(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_empty_get_missing_parent_inventories(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_empty_get_missing_parent_inventories(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_empty_get_missing_parent_inventories(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_get_missing_parent_inventories_check(RepositoryFormat4)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_get_missing_parent_inventories(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_get_missing_parent_inventories(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_get_missing_parent_inventories(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_get_missing_parent_inventories(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_get_missing_parent_inventories(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_get_missing_parent_inventories(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_get_missing_parent_inventories(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_get_missing_parent_inventories(RepositoryFormatKnitPack1)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_get_missing_parent_inventories(RepositoryFormatKnitPack3)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_get_missing_parent_inventories(RepositoryFormatKnitPack4)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_ghost_revision(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_ghost_revision(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_ghost_revision(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_ghost_revision(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_ghost_revision(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_ghost_revision(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_ghost_revision(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_ghost_revision(RepositoryFormatKnitPack1)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_ghost_revision(RepositoryFormatKnitPack3)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_ghost_revision(RepositoryFormatKnitPack4)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_passes_resume_info(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_passes_resume_info(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_passes_resume_info(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_passes_resume_info(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_passes_resume_info(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_passes_resume_info(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_passes_resume_info(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_passes_resume_info(RepositoryFormatKnitPack1)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_passes_resume_info(RepositoryFormatKnitPack3)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_passes_resume_info(RepositoryFormatKnitPack4)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_lock(RepositoryFormat2a)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_lock(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_lock(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_lock(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_lock(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_lock(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_lock(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_lock(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_lock(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_lock(RepositoryFormatKnitPack1)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_lock(RepositoryFormatKnitPack3)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_lock(RepositoryFormatKnitPack4)
@@ -2411,24 +3187,102 @@
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_write_group(RepositoryFormat2a)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_write_group(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_write_group(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_write_group(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_write_group(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_write_group(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_write_group(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_write_group(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_write_group(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_write_group(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_write_group(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking_fails_without_write_group(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking(RepositoryFormat4)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_add_missing_parent_after_resume(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_add_missing_parent_after_resume(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_add_missing_parent_after_resume(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_add_missing_parent_after_resume(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_add_missing_parent_after_resume(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_add_missing_parent_after_resume(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_add_missing_parent_after_resume(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_cannot_resume_aborted_write_group(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_cannot_resume_aborted_write_group(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_cannot_resume_aborted_write_group(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_cannot_resume_aborted_write_group(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_cannot_resume_aborted_write_group(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_cannot_resume_aborted_write_group(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_cannot_resume_aborted_write_group(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_adding_missing_parents(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_adding_missing_parents(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_adding_missing_parents(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_adding_missing_parents(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_adding_missing_parents(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_adding_missing_parents(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_adding_missing_parents(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_no_new_data(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_no_new_data(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_no_new_data(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_no_new_data(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_no_new_data(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_no_new_data(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_no_new_data(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_plus_new_data(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_plus_new_data(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_plus_new_data(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_plus_new_data(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_plus_new_data(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_plus_new_data(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_plus_new_data(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_with_missing_parents(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_with_missing_parents(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_with_missing_parents(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_with_missing_parents(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_with_missing_parents(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_with_missing_parents(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_with_missing_parents(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_multiple_resume_write_group(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_multiple_resume_write_group(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_multiple_resume_write_group(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_multiple_resume_write_group(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_multiple_resume_write_group(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_multiple_resume_write_group(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_multiple_resume_write_group(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_no_op_suspend_resume(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_no_op_suspend_resume(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_no_op_suspend_resume(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_no_op_suspend_resume(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_no_op_suspend_resume(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_no_op_suspend_resume(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_no_op_suspend_resume(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_resume_abort_fails(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_resume_abort_fails(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_resume_abort_fails(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_resume_abort_fails(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_resume_abort_fails(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_resume_abort_fails(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_resume_abort_fails(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_second_suspend_fails(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_second_suspend_fails(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_second_suspend_fails(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_second_suspend_fails(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_second_suspend_fails(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_second_suspend_fails(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_second_suspend_fails(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_suspend_fails(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_suspend_fails(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_suspend_fails(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_suspend_fails(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_suspend_fails(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_suspend_fails(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_suspend_fails(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_empty_initial_write_group(RepositoryFormat2a)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_empty_initial_write_group(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_empty_initial_write_group(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_empty_initial_write_group(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_empty_initial_write_group(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_empty_initial_write_group(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_empty_initial_write_group(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_empty_initial_write_group(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_empty_initial_write_group(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_empty_initial_write_group(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_empty_initial_write_group(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_empty_initial_write_group(RepositoryFormatPackDevelopment2Subtree)
@@ -2436,6 +3290,12 @@
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_empty_initial_write_group(RepositoryFormat2a)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_empty_initial_write_group(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_empty_initial_write_group(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_empty_initial_write_group(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_empty_initial_write_group(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_empty_initial_write_group(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_empty_initial_write_group(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_empty_initial_write_group(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_empty_initial_write_group(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_empty_initial_write_group(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_empty_initial_write_group(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_empty_initial_write_group(RepositoryFormatPackDevelopment2Subtree)
@@ -3320,6 +4180,7 @@
 breezy.tests.per_transport.TransportTests.test_win32_abspath(TransportLogDecorator,LogDecoratorServer)
 breezy.tests.per_transport.TransportTests.test_win32_abspath(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_win32_abspath(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_tree.test_annotate_iter.TestAnnotate.test_annotate_with_ghost(WorkingTreeFormat2)
 breezy.tests.per_tree.test_get_file_mtime.TestGetFileMTime.test_get_file_mtime(WorkingTreeFormat4)
 breezy.tests.per_tree.test_get_file_mtime.TestGetFileMTime.test_get_file_mtime(WorkingTreeFormat5)
 breezy.tests.per_tree.test_get_file_mtime.TestGetFileMTime.test_get_file_mtime(WorkingTreeFormat6)
@@ -3339,6 +4200,9 @@
 breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_symlink_target(WorkingTreeFormat6)
 breezy.tests.per_tree.test_inv.TestInventory.test_canonical_tree_name_mismatch(PreviewTree)
 breezy.tests.per_tree.test_inv.TestInventory.test_canonical_tree_name_mismatch(PreviewTreePost)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_tree_name_mismatch(WorkingTreeFormat4)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_tree_name_mismatch(WorkingTreeFormat5)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_tree_name_mismatch(WorkingTreeFormat6)
 breezy.tests.per_tree.test_inv.TestInventory.test_paths2ids_recursive(WorkingTreeFormat4)
 breezy.tests.per_tree.test_inv.TestInventory.test_paths2ids_recursive(WorkingTreeFormat5)
 breezy.tests.per_tree.test_inv.TestInventory.test_paths2ids_recursive(WorkingTreeFormat6)
@@ -3369,12 +4233,24 @@
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_symlink_content_summary(WorkingTreeFormat4)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_symlink_content_summary(WorkingTreeFormat5)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_symlink_content_summary(WorkingTreeFormat6)
+breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_tree_content_summary(WorkingTreeFormat2)
+breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_tree_content_summary(WorkingTreeFormat3)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_tree_content_summary(WorkingTreeFormat4)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_tree_content_summary(WorkingTreeFormat5)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_tree_content_summary(WorkingTreeFormat6)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_unicode_symlink_target_summary(WorkingTreeFormat4)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_unicode_symlink_target_summary(WorkingTreeFormat5)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_unicode_symlink_target_summary(WorkingTreeFormat6)
+breezy.tests.per_tree.test_revision_tree.TestRevisionTree.test_get_random_tree_raises(PreviewTree)
+breezy.tests.per_tree.test_revision_tree.TestRevisionTree.test_get_random_tree_raises(PreviewTreePost)
+breezy.tests.per_tree.test_revision_tree.TestRevisionTree.test_get_random_tree_raises(WorkingTreeFormat2)
+breezy.tests.per_tree.test_revision_tree.TestRevisionTree.test_get_random_tree_raises(WorkingTreeFormat4)
+breezy.tests.per_tree.test_revision_tree.TestRevisionTree.test_get_random_tree_raises(WorkingTreeFormat5)
+breezy.tests.per_tree.test_revision_tree.TestRevisionTree.test_get_random_tree_raises(WorkingTreeFormat6)
+breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_empty_tree_no_parents(WorkingTreeFormat2)
+breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_empty_tree_no_parents(WorkingTreeFormat4)
+breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_empty_tree_no_parents(WorkingTreeFormat5)
+breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_empty_tree_no_parents(WorkingTreeFormat6)
 breezy.tests.per_tree.test_tree.TestConflicts.test_conflicts(PreviewTree)
 breezy.tests.per_tree.test_tree.TestConflicts.test_conflicts(PreviewTreePost)
 breezy.tests.per_tree.test_tree.TestConflicts.test_conflicts(WorkingTreeFormat4)
@@ -3392,6 +4268,8 @@
 breezy.tests.per_tree.test_tree.TestHasId.test_has_id(WorkingTreeFormat6)
 breezy.tests.per_tree.test_tree.TestHasVersionedDirectories.test_has_versioned_directories(PreviewTree)
 breezy.tests.per_tree.test_tree.TestHasVersionedDirectories.test_has_versioned_directories(PreviewTreePost)
+breezy.tests.per_tree.test_tree.TestHasVersionedDirectories.test_has_versioned_directories(WorkingTreeFormat2)
+breezy.tests.per_tree.test_tree.TestHasVersionedDirectories.test_has_versioned_directories(WorkingTreeFormat3)
 breezy.tests.per_tree.test_tree.TestHasVersionedDirectories.test_has_versioned_directories(WorkingTreeFormat4)
 breezy.tests.per_tree.test_tree.TestHasVersionedDirectories.test_has_versioned_directories(WorkingTreeFormat5)
 breezy.tests.per_tree.test_tree.TestHasVersionedDirectories.test_has_versioned_directories(WorkingTreeFormat6)
@@ -3458,6 +4336,7 @@
 breezy.tests.per_versionedfile.TestVersionedFiles.test_check_progressbar_parameter(groupcompress-nograph)
 breezy.tests.per_versionedfile.TestVersionedFiles.test_check_progressbar_parameter(named-graph-knit-pack)
 breezy.tests.per_versionedfile.TestVersionedFiles.test_check_progressbar_parameter(named-graph-nodelta-knit-pack)
+breezy.tests.per_versionedfile.TestVersionedFiles.test_check_progressbar_parameter(named-knit)
 breezy.tests.per_versionedfile.TestVersionedFiles.test_check_progressbar_parameter(named-nograph-nodelta-knit-pack)
 breezy.tests.per_versionedfile.TestVersionedFiles.test_check_progressbar_parameter(plain-knit-pack)
 breezy.tests.per_versionedfile.TestVersionedFiles.test_check_progressbar_parameter(weave-named)
@@ -3518,6 +4397,7 @@
 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_missing_keys(groupcompress-nograph)
 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_missing_keys(named-graph-knit-pack)
 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_missing_keys(named-graph-nodelta-knit-pack)
+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_missing_keys(named-knit)
 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_missing_keys(named-nograph-nodelta-knit-pack)
 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_missing_keys(plain-knit-pack)
 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_missing_keys(weave-named)
@@ -3536,6 +4416,7 @@
 breezy.tests.per_versionedfile.TestWeave.test_make_mpdiffs_with_ghosts
 breezy.tests.per_versionedfile.TestWeave.test_mutate_after_finish
 breezy.tests.per_versionedfile.TestWeave.test_no_implicit_create
+breezy.tests.per_versionedfile.TestWeave.test_readonly_mode
 breezy.tests.per_versionedfile.VirtualVersionedFilesTests.test_add_lines
 breezy.tests.per_versionedfile.VirtualVersionedFilesTests.test_add_mpdiffs
 breezy.tests.per_versionedfile.VirtualVersionedFilesTests.test_check_noerrors
@@ -3567,12 +4448,16 @@
 breezy.tests.per_workingtree.test_break_lock.TestBreakLock.test_locked(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_break_lock.TestBreakLock.test_locked(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_break_lock.TestBreakLock.test_locked(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_break_lock.TestBreakLock.test_unlocked_repo_locked(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_break_lock.TestBreakLock.test_unlocked_repo_locked(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_break_lock.TestBreakLock.test_unlocked_repo_locked(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_break_lock.TestBreakLock.test_unlocked_repo_locked(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_break_lock.TestBreakLock.test_unlocked(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_break_lock.TestBreakLock.test_unlocked(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_break_lock.TestBreakLock.test_unlocked(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_break_lock.TestBreakLock.test_unlocked(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_check_state.TestCheckState.test_check_broken_dirstate(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_check_state.TestCheckState.test_check_broken_dirstate(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_check_state.TestCheckState.test_check_state(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_check_state.TestCheckState.test_check_state(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_check_state.TestCheckState.test_check_state(WorkingTreeFormat6)
@@ -3582,6 +4467,16 @@
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_local_unbound(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_local_unbound(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_local_unbound(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_commit.TestCommit.test_local_commit_does_not_push_to_master(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_commit.TestCommit.test_local_commit_ignores_master(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_commit.TestCommit.test_nested_commit_second_commit_detects_changes(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_commit.TestCommit.test_nested_commit_second_commit_detects_changes(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_commit.TestCommit.test_nested_commit(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_commit.TestCommit.test_nested_commit(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_commit.TestCommit.test_nested_pointless_commits_are_pointless(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_commit.TestCommit.test_nested_pointless_commits_are_pointless(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_commit.TestCommit.test_record_initial_ghost(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_commit.TestCommit.test_record_two_ghosts(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_eol_conversion.TestEolConversion.test_eol_crlf_binary(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_eol_conversion.TestEolConversion.test_eol_crlf_binary(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_eol_conversion.TestEolConversion.test_eol_crlf_binary(WorkingTreeFormat4)
@@ -3681,6 +4576,8 @@
 breezy.tests.per_workingtree.test_flush.TestFlush.test_flush_fresh_tree(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_flush.TestFlush.test_flush_fresh_tree(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_flush.TestFlush.test_flush_fresh_tree(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_flush.TestFlush.test_flush_with_no_lock_fails(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_flush.TestFlush.test_flush_with_no_lock_fails(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_flush.TestFlush.test_flush_with_no_lock_fails(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_flush.TestFlush.test_flush_with_no_lock_fails(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_flush.TestFlush.test_flush_with_no_lock_fails(WorkingTreeFormat6)
@@ -3693,18 +4590,25 @@
 breezy.tests.per_workingtree.test_get_file_mtime.TestGetFileMTime.test_missing(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_get_file_mtime.TestGetFileMTime.test_missing(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_get_file_mtime.TestGetFileMTime.test_missing(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_inv.TestTreeReference.test_tree_reference_matches_inv(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_inv.TestTreeReference.test_tree_reference_matches_inv(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_inv.TestTreeReference.test_tree_reference_matches_inv(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_inv.TestTreeReference.test_tree_reference_matches_inv(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_inv.TestTreeReference.test_tree_reference_matches_inv(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_is_control_filename.TestIsControlFilename.test_dotbzr_is_control_in_cwd(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_is_control_filename.TestIsControlFilename.test_dotbzr_is_control_in_cwd(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_is_control_filename.TestIsControlFilename.test_dotbzr_is_control_in_cwd(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_is_control_filename.TestIsControlFilename.test_dotbzr_is_control_in_cwd(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_is_control_filename.TestIsControlFilename.test_dotbzr_is_control_in_cwd(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_is_control_filename.TestIsControlFilename.test_dotbzr_is_control_in_subdir(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_is_control_filename.TestIsControlFilename.test_dotbzr_is_control_in_subdir(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_is_control_filename.TestIsControlFilename.test_dotbzr_is_control_in_subdir(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_is_control_filename.TestIsControlFilename.test_dotbzr_is_control_in_subdir(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_is_control_filename.TestIsControlFilename.test_dotbzr_is_control_in_subdir(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_failing_to_lock_branch_does_not_lock(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_failing_to_lock_branch_does_not_lock(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_failing_to_lock_branch_does_not_lock(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_failing_to_lock_tree_write_branch_does_not_lock(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_failing_to_lock_tree_write_branch_does_not_lock(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_failing_to_lock_tree_write_branch_does_not_lock(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_failing_to_lock_tree_write_branch_does_not_lock(WorkingTreeFormat6)
@@ -3714,6 +4618,7 @@
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_lock_read_returns_unlocker(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_lock_read_returns_unlocker(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_lock_read_returns_unlocker(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_lock_tree_write_returns_unlocker(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_lock_tree_write_returns_unlocker(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_lock_tree_write_returns_unlocker(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_lock_tree_write_returns_unlocker(WorkingTreeFormat6)
@@ -3723,9 +4628,11 @@
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_read_unlock(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_read_unlock(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_read_unlock(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_tree_write_branch_read_locked(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_tree_write_branch_read_locked(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_tree_write_branch_read_locked(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_tree_write_branch_read_locked(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_tree_write_unlock(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_tree_write_unlock(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_tree_write_unlock(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_tree_write_unlock(WorkingTreeFormat6)
@@ -3735,6 +4642,18 @@
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_unlock_branch_failures(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_unlock_branch_failures(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_unlock_branch_failures(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_nested_specifics.TestNestedSupport.test_comparison_data_does_not_autodetect_subtree(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_nested_specifics.TestNestedSupport.test_comparison_data_does_not_autodetect_subtree(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_nested_specifics.TestNestedSupport.test_extract_while_locked(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_nested_specifics.TestNestedSupport.test_extract_while_locked(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_nested_specifics.TestNestedSupport.test_inventory_does_not_autodetect_subtree(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_nested_specifics.TestNestedSupport.test_inventory_does_not_autodetect_subtree(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_nested_specifics.TestNestedSupport.test_iter_entries_by_dir_autodetects_subtree(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_nested_specifics.TestNestedSupport.test_iter_entries_by_dir_autodetects_subtree(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_nested_specifics.TestNestedSupport.test_kind_does_not_autodetect_subtree(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_nested_specifics.TestNestedSupport.test_kind_does_not_autodetect_subtree(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_nested_specifics.TestNestedSupport.test_set_get_tree_reference(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_nested_specifics.TestNestedSupport.test_set_get_tree_reference(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_parents.TestAddParent.test_add_first_parent_id_ghost_rejects(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_parents.TestAddParent.test_add_first_parent_id_ghost_rejects(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_parents.TestAddParent.test_add_first_parent_id_ghost_rejects(WorkingTreeFormat6)
@@ -3772,18 +4691,36 @@
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_keep(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_keep(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_keep(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_nonexisting_files(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_revision_tree.TestRevisionTree.test_get_uncached_basis_via_revision_tree(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_revision_tree.TestRevisionTree.test_get_zeroth_basis_tree_via_revision_tree(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_revision_tree.TestRevisionTree.test_get_zeroth_basis_tree_via_revision_tree(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_revision_tree.TestRevisionTree.test_get_zeroth_basis_tree_via_revision_tree(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_set_root_id.TestSetRootId.test_set_and_read_unicode(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_set_root_id.TestSetRootId.test_set_and_read_unicode(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_set_root_id.TestSetRootId.test_set_and_read_unicode(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_shelf_manager.TestShelfManager.test_shelf_manager(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_shelf_manager.TestShelfManager.test_shelf_manager(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_shelf_manager.TestShelfManager.test_shelf_manager(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_shelf_manager.TestShelfManager.test_shelf_manager(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_shelf_manager.TestShelfManager.test_shelf_manager(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_add_non_existant(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_add_non_existant(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_add_non_existant(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_add_non_existant(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_path_containing_carriagereturn_skips(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_path_containing_carriagereturn_skips(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_path_containing_carriagereturn_skips(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_path_containing_newline_skips(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_path_containing_newline_skips(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_path_containing_newline_skips(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_save_false(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_save_false(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_save_false(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_skip_nested_trees(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_skip_nested_trees(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_skip_nested_trees(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_missing_file(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_missing_file(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_missing_file(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_missing_file(WorkingTreeFormat6)
@@ -3825,6 +4762,8 @@
 breezy.tests.per_workingtree.test_views.TestTreeViews.test_views_initially_empty(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_views.TestTreeViews.test_views_initially_empty(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_views.TestTreeViews.test_views_initially_empty(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_views.TestUnsupportedViews.test_view_methods_raise(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_views.TestUnsupportedViews.test_view_methods_raise(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_views.TestUnsupportedViews.test_view_methods_raise(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_views.TestUnsupportedViews.test_view_methods_raise(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_views.TestUnsupportedViews.test_view_methods_raise(WorkingTreeFormat6)
@@ -3832,6 +4771,8 @@
 breezy.tests.per_workingtree.test_walkdirs.TestWalkdirs.test_walkdir_from_unknown_dir(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_walkdirs.TestWalkdirs.test_walkdir_from_unknown_dir(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_walkdirs.TestWalkdirs.test_walkdir_from_unknown_dir(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_workingtree.TestControlComponent.test_urls(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_workingtree.TestControlComponent.test_urls(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_workingtree.TestControlComponent.test_urls(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_workingtree.TestControlComponent.test_urls(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestControlComponent.test_urls(WorkingTreeFormat6)
@@ -3853,25 +4794,34 @@
 breezy.tests.per_workingtree.test_workingtree.TestFormatAttributes.test_versioned_directories(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestFormatAttributes.test_versioned_directories(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_workingtree.TestFormatAttributes.test_versioned_directories(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_add_conflicts(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_add_in_unversioned(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_add_in_unversioned(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_add_in_unversioned(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_add_in_unversioned(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_add_missing(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_add_missing(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_add_missing(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_add_missing(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_all_file_ids_with_missing(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_all_file_ids_with_missing(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_all_file_ids_with_missing(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_basic_relpath(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_basic_relpath(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_basic_relpath(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_basic_relpath(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_basic_relpath(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_branch_attribute_is_not_settable(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_branch_attribute_is_not_settable(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_branch_attribute_is_not_settable(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_branch_attribute_is_not_settable(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_branch_attribute_is_not_settable(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_branch_builder(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_branch_builder(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_branch_builder(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_branch_builder(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_branch_builder(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_case_sensitive(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_case_sensitive(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_case_sensitive(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_case_sensitive(WorkingTreeFormat6)
@@ -3881,21 +4831,29 @@
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_clone_tree_revision(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_clone_tree_revision(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_clone_tree_revision(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_conflicts(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_detect_real_kind(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_detect_real_kind(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_detect_real_kind(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_filter_unversioned_files(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_filter_unversioned_files(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_filter_unversioned_files(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_format_description(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_format_description(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_format_description(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_format_description(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_format_description(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_format_leftmost_parent_id_as_ghost(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_format_leftmost_parent_id_as_ghost(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_format_leftmost_parent_id_as_ghost(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_format_leftmost_parent_id_as_ghost(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_format_leftmost_parent_id_as_ghost(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_get_config_stack(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_get_config_stack(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_get_config_stack(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_get_config_stack(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_get_config_stack(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_initialize(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_initialize(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_initialize(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_initialize(WorkingTreeFormat6)
@@ -3905,18 +4863,26 @@
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_lock_locks_branch(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_lock_locks_branch(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_lock_locks_branch(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_open_containing(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_open_containing(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_open_containing(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_open_containing(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_supports_executable(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_supports_executable(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_supports_executable(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_update_updates_bound_branch_no_local_commits(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_workingtree.TestWorthSavingLimit.test_invalid(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_workingtree.TestWorthSavingLimit.test_invalid(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_workingtree.TestWorthSavingLimit.test_invalid(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_workingtree.TestWorthSavingLimit.test_invalid(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorthSavingLimit.test_invalid(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_workingtree.TestWorthSavingLimit.test_not_set(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_workingtree.TestWorthSavingLimit.test_not_set(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_workingtree.TestWorthSavingLimit.test_not_set(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_workingtree.TestWorthSavingLimit.test_not_set(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorthSavingLimit.test_not_set(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_workingtree.TestWorthSavingLimit.test_set_in_branch(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_workingtree.TestWorthSavingLimit.test_set_in_branch(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_workingtree.TestWorthSavingLimit.test_set_in_branch(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_workingtree.TestWorthSavingLimit.test_set_in_branch(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorthSavingLimit.test_set_in_branch(WorkingTreeFormat6)
@@ -3988,12 +4954,18 @@
 breezy.tests.test_bisect_multi.TestBisectMultiBytes.test_lookup_no_keys_no_calls
 breezy.tests.test_bisect_multi.TestBisectMultiBytes.test_lookup_when_a_key_is_missing_continues
 breezy.tests.test_bisect_multi.TestBisectMultiBytes.test_searches_different_keys_in_different_directions
+breezy.tests.test_branchbuilder.TestBranchBuilder.test_format
 breezy.tests.test_branch.BzrBranch8.test_reference_info_caches_cleared
 breezy.tests.test_branch.BzrBranch8.test_reference_info_caching_read_locked
 breezy.tests.test_branch.BzrBranch8.test_reference_info_caching_read_unlocked
 breezy.tests.test_branch.BzrBranch8.test_reference_info_caching_write_locked
+breezy.tests.test_branch.TestBranch6.test_creation
+breezy.tests.test_branch.TestBranch6.test_default_stacked_location
+breezy.tests.test_branch.TestBranch6.test_layout
+breezy.tests.test_branch.TestBranch6.test_set_stacked_on_url_errors
 breezy.tests.test_branch.TestBranch7.test_creation
 breezy.tests.test_branch.TestBranch7.test_layout
+breezy.tests.test_branch.TestBranch7.test_set_stacked_on_url_unstackable_repo
 breezy.tests.test_branch.TestBranchFormat5.test_branch_format_5_uses_lockdir
 breezy.tests.test_branch.TestBranchFormatRegistry.test_default
 breezy.tests.test_branch.TestBranchFormatRegistry.test_get_all
@@ -4144,9 +5116,16 @@
 breezy.tests.test_bugtracker.TestURLParametrizedIntegerBugTracker.test_get_bug_url_for_bad_bug
 breezy.tests.test_bundle.BTreeTester.test_moves
 breezy.tests.test_bundle.BTreeTester.test_renames
+breezy.tests.test_bundle.BundleTester1.test_mismatched_bundle
 breezy.tests.test_bundle.TestBundleWriterReader.test_decode_name
 breezy.tests.test_bundle.TestBundleWriterReader.test_encode_name
 breezy.tests.test_bundle.TestReadMergeableFromUrl.test_infinite_redirects_are_not_a_bundle
+breezy.tests.test_bundle.V08BundleTester.test_crlf_bundle
+breezy.tests.test_bundle.V09BundleKnit1Tester.test_crlf_bundle
+breezy.tests.test_bundle.V09BundleKnit2Tester.test_crlf_bundle
+breezy.tests.test_bundle.V4_2aBundleTester.test_crlf_bundle
+breezy.tests.test_bundle.V4BundleTester.test_crlf_bundle
+breezy.tests.test_bzrdir.ChrootedTests.test_cloning_metadir
 breezy.tests.test_bzrdir.ChrootedTests.test_find_branches
 breezy.tests.test_bzrdir.ChrootedTests.test_find_controldirs
 breezy.tests.test_bzrdir.ChrootedTests.test_find_controldirs_evaluate
@@ -4161,8 +5140,17 @@
 breezy.tests.test_bzrdir.ChrootedTests.test_open_from_transport_bzrdir_in_parent
 breezy.tests.test_bzrdir.ChrootedTests.test_open_from_transport_no_bzrdir
 breezy.tests.test_bzrdir.NonLocalTests.test_create_branch_convenience_force_tree_not_local_fails
+breezy.tests.test_bzrdir.TestBzrDirFormat.test_create_branch_and_repo_under_shared
+breezy.tests.test_bzrdir.TestBzrDirFormat.test_create_branch_and_repo_under_shared_force_new
 breezy.tests.test_bzrdir.TestBzrDirFormat.test_create_branch_and_repo_uses_default
+breezy.tests.test_bzrdir.TestBzrDirFormat.test_create_branch_convenience
+breezy.tests.test_bzrdir.TestBzrDirFormat.test_create_branch_convenience_possible_transports
+breezy.tests.test_bzrdir.TestBzrDirFormat.test_create_branch_convenience_root
+breezy.tests.test_bzrdir.TestBzrDirFormat.test_create_branch_convenience_under_shared_repo
+breezy.tests.test_bzrdir.TestBzrDirFormat.test_create_branch_convenience_under_shared_repo_force_new_repo
+breezy.tests.test_bzrdir.TestBzrDirFormat.test_create_branch_convenience_under_shared_repo_force_no_tree
 breezy.tests.test_bzrdir.TestBzrDirFormat.test_create_standalone_working_tree
+breezy.tests.test_bzrdir.TestBzrDirFormat.test_create_standalone_working_tree_under_shared_repo
 breezy.tests.test_bzrdir.TestBzrDirFormat.test_find_format
 breezy.tests.test_bzrdir.TestBzrDirFormat.test_find_format_nothing_there
 breezy.tests.test_bzrdir.TestBzrDirFormat.test_register_unregister_format
@@ -4192,6 +5180,7 @@
 breezy.tests.test_bzrdir.TestMeta1DirColoFormat.test_upgrade_from_2a
 breezy.tests.test_bzrdir.TestMeta1DirFormat.test_comparison
 breezy.tests.test_bzrdir.TestMeta1DirFormat.test_meta1dir_uses_lockdir
+breezy.tests.test_bzrdir.TestMeta1DirFormat.test_needs_conversion_different_working_tree
 breezy.tests.test_bzrdir.TestMeta1DirFormat.test_right_base_dirs
 breezy.tests.test_bzrdir.TestMeta1DirFormat.test_with_features
 breezy.tests.test_bzrdir.TestRepositoryAcquisitionPolicy.test_acquire_repository_standalone
@@ -5065,6 +6054,7 @@
 breezy.tests.test_export_pot.TestParseSource.test_strings_docstrings
 breezy.tests.test_export_pot.TestParseSource.test_strings_literals
 breezy.tests.test_export_pot.TestParseSource.test_strings_multiline
+breezy.tests.test_export_pot.TestWriteOption.test_option_hidden
 breezy.tests.test_export.RootNameTests.test_root_name
 breezy.tests.test_export.TarExporterTests.test_xz_stdout
 breezy.tests.test_export.TestDirExport.test_empty
@@ -5402,6 +6392,10 @@
 breezy.tests.test_http.TestAuthHeader.test_digest_header
 breezy.tests.test_http.TestAuthHeader.test_empty_header
 breezy.tests.test_http.TestAuthHeader.test_negotiate_header
+breezy.tests.test_http.TestAuth.test_changing_nonce(urllib,HTTP/1.0,basic)
+breezy.tests.test_http.TestAuth.test_changing_nonce(urllib,HTTP/1.0,basicdigest)
+breezy.tests.test_http.TestAuth.test_changing_nonce(urllib,HTTP/1.1,basic)
+breezy.tests.test_http.TestAuth.test_changing_nonce(urllib,HTTP/1.1,basicdigest)
 breezy.tests.test_http.TestBadStatusServer.test_http_get(urllib,HTTP/1.0)
 breezy.tests.test_http.TestBadStatusServer.test_http_has(urllib,HTTP/1.0)
 breezy.tests.test_http.TestHttpProxyWhiteBox.test_evaluate_proxy_bypass_false
@@ -5422,6 +6416,12 @@
 breezy.tests.test_http.TestHttpTransportUrls.test_invalid_http_urls(urllib)
 breezy.tests.test_http.TestInvalidStatusServer.test_http_get(urllib,HTTP/1.0)
 breezy.tests.test_http.TestInvalidStatusServer.test_http_has(urllib,HTTP/1.0)
+breezy.tests.test_http.TestProxyAuth.test_changing_nonce(urllib,HTTP/1.0,proxy-basic)
+breezy.tests.test_http.TestProxyAuth.test_changing_nonce(urllib,HTTP/1.0,proxy-basicdigest)
+breezy.tests.test_http.TestProxyAuth.test_changing_nonce(urllib,HTTP/1.1,proxy-basic)
+breezy.tests.test_http.TestProxyAuth.test_changing_nonce(urllib,HTTP/1.1,proxy-basicdigest)
+breezy.tests.test_http.TestProxyHttpServer.test_http_proxy_without_scheme(urllib,HTTP/1.0)
+breezy.tests.test_http.TestProxyHttpServer.test_http_proxy_without_scheme(urllib,HTTP/1.1)
 breezy.tests.test_http.TestRangeHeader.test_range_header_mixed
 breezy.tests.test_http.TestRangeHeader.test_range_header_multi
 breezy.tests.test_http.TestRangeHeader.test_range_header_single
@@ -5476,6 +6476,8 @@
 breezy.tests.test_index.TestCombinedGraphIndex.test_iter_nothing_empty
 breezy.tests.test_index.TestCombinedGraphIndex.test_open_missing_index_no_error
 breezy.tests.test_index.TestCombinedGraphIndex.test_validate_empty
+breezy.tests.test_index.TestGraphIndexBuilder.test_add_node_bad_key
+breezy.tests.test_index.TestGraphIndexBuilder.test_add_node_bad_key_in_reference_lists
 breezy.tests.test_index.TestGraphIndexBuilder.test_clear_cache
 breezy.tests.test_index.TestGraphIndexBuilder.test_set_optimize
 breezy.tests.test_index.TestGraphIndexPrefixAdapter.test_construct
@@ -5485,12 +6487,14 @@
 breezy.tests.test_index.TestGraphIndex.test_iter_nothing_empty
 breezy.tests.test_index.TestGraphIndex.test_open_sets_parsed_map_empty
 breezy.tests.test_index.TestGraphIndex.test_supports_unlimited_cache
+breezy.tests.test_index.TestGraphIndex.test_validate_missing_end_line_empty
 breezy.tests.test_index.TestInMemoryGraphIndex.test_iter_all_entries_empty
 breezy.tests.test_index.TestInMemoryGraphIndex.test_iter_missing_entry_empty
 breezy.tests.test_index.TestInMemoryGraphIndex.test_iter_nothing_empty
 breezy.tests.test_index.TestInMemoryGraphIndex.test_key_count_empty
 breezy.tests.test_index.TestInMemoryGraphIndex.test_validate_empty
 breezy.tests.test_info.TestInfo.test_describe_branch_format
+breezy.tests.test_info.TestInfo.test_describe_repo_format
 breezy.tests.test_info.TestInfo.test_gather_location_bound
 breezy.tests.test_info.TestInfo.test_gather_location_controldir_only
 breezy.tests.test_info.TestInfo.test_gather_location_repo
@@ -5720,6 +6724,7 @@
 breezy.tests.test_knit.LowLevelKnitIndexTests_c.test_trailing_characters
 breezy.tests.test_knit.LowLevelKnitIndexTests_c.test_write_utf8_parents
 breezy.tests.test_knit.LowLevelKnitIndexTests_c.test_write_utf8_version_id
+breezy.tests.test_knit.LowLevelKnitIndexTests.test_create_file
 breezy.tests.test_knit.LowLevelKnitIndexTests.test__get_total_build_size
 breezy.tests.test_knit.LowLevelKnitIndexTests.test_scan_unvalidated_index_not_implemented
 breezy.tests.test_knit.TestAnnotatedKnitContent.test_annotate
@@ -5753,6 +6758,7 @@
 breezy.tests.test_knit.TestPlainKnitContent.test_line_delta_iter
 breezy.tests.test_knit.TestPlainKnitContent.test_text
 breezy.tests.test_knit.TestStacking.test_add_fallback_versioned_files
+breezy.tests.test_knit.TestStacking.test_check
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_filling_in_ghosts_resets_head_cache(python)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_filling_in_ghosts_resets_head_cache(python-nocache)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_alt_merge(python)
@@ -6550,12 +7556,16 @@
 breezy.tests.test_repository.TestDefaultFormat.test_get_set_default_format
 breezy.tests.test_repository.TestFeatures.test_open_with_missing_required_feature
 breezy.tests.test_repository.TestFeatures.test_open_with_present_feature
+breezy.tests.test_repository.TestFormatKnit1.test_attribute__fetch_order
+breezy.tests.test_repository.TestFormatKnit1.test_attribute__fetch_uses_deltas
+breezy.tests.test_repository.TestFormatKnit1.test_supports_external_lookups
 breezy.tests.test_repository.TestInterRepository.test_get_default_inter_repository
 breezy.tests.test_repository.TestInterRepository.test_register_inter_repository_class
 breezy.tests.test_repository.TestKnitPackStreamSource.test_source_to_exact_pack_092
 breezy.tests.test_repository.TestKnitPackStreamSource.test_source_to_exact_pack_19
 breezy.tests.test_repository.TestKnitPackStreamSource.test_source_to_exact_pack_19_rich_root
 breezy.tests.test_repository.TestKnitPackStreamSource.test_source_to_exact_pack_rich_root_pack
+breezy.tests.test_repository.TestKnitPackStreamSource.test_stream_source_to_knit
 breezy.tests.test_repository.TestKnitPackStreamSource.test_stream_source_to_non_exact
 breezy.tests.test_repository.TestKnitPackStreamSource.test_stream_source_to_non_exact_rich_root
 breezy.tests.test_repository.Test_LazyListJoin.test__repr__
@@ -6563,6 +7573,9 @@
 breezy.tests.test_repository.TestOptimisingPacker.test_open_pack_will_optimise
 breezy.tests.test_repository.TestPack.test___eq____ne__
 breezy.tests.test_repository.TestPack.test_file_name
+breezy.tests.test_repository.TestRepositoryFormatKnit3.test_attribute__fetch_order
+breezy.tests.test_repository.TestRepositoryFormatKnit3.test_attribute__fetch_uses_deltas
+breezy.tests.test_repository.TestRepositoryFormatKnit3.test_supports_external_lookups
 breezy.tests.test_repository.TestRepositoryFormatRegistry.test_get_all
 breezy.tests.test_repository.TestRepositoryFormatRegistry.test_register_extra
 breezy.tests.test_repository.TestRepositoryFormatRegistry.test_register_extra_lazy
@@ -7008,6 +8021,7 @@
 breezy.tests.test_smart.TestSmartServerBzrDirRequestHasWorkingTree.test_has_workingtree_yes
 breezy.tests.test_smart.TestSmartServerIsReadonly.test_is_readonly_no
 breezy.tests.test_smart.TestSmartServerIsReadonly.test_is_readonly_yes
+breezy.tests.test_smart.TestSmartServerPackRepositoryAutopack.test_autopack_on_nonpack_format
 breezy.tests.test_smart.TestSmartServerRepositoryGetPhysicalLockStatus.test_without_write_lock
 breezy.tests.test_smart.TestSmartServerRepositoryGetPhysicalLockStatus.test_with_write_lock
 breezy.tests.test_smart.TestSmartServerRepositoryIterFilesBytes.test_missing
@@ -7531,6 +8545,7 @@
 breezy.tests.test_url_policy_open.TestBranchOpenerCheckAndFollowBranchReference.test_not_reference
 breezy.tests.test_url_policy_open.TestBranchOpenerCheckAndFollowBranchReference.test_self_referencing_branch
 breezy.tests.test_url_policy_open.TestBranchOpenerStacking.test_default_probers
+breezy.tests.test_url_policy_open.TestBranchOpenerStacking.test_nstackable_repository
 breezy.tests.test_url_policy_open.TestBranchOpenerStacking.test_probers
 breezy.tests.test_urlutils.QuoteTests.test_quote
 breezy.tests.test_urlutils.QuoteTests.test_quote_tildes
@@ -7648,6 +8663,7 @@
 breezy.tests.test_win32utils.TestWin32UtilsGlobExpand.test_empty_tree
 breezy.tests.test_win32utils.TestWin32UtilsGlobExpand.test_tree_ascii
 breezy.tests.test_win32utils.TestWin32UtilsGlobExpand.test_unicode_backslashes
+breezy.tests.test_workingtree_4.TestWorkingTreeFormat4.test_default_root_id
 breezy.tests.test_workingtree_4.TestWorkingTreeFormat4.test_empty_basis_revtree_to_dirstate_tree
 breezy.tests.test_workingtree_4.TestWorkingTreeFormat4.test_empty_basis_to_dirstate_tree
 breezy.tests.test_workingtree_4.TestWorkingTreeFormat4.test_new_dirstate_on_new_lock
@@ -7666,10 +8682,12 @@
 breezy.tests.test_workingtree.TestTreeEntry.test_kind_character
 breezy.tests.test_workingtree.TestTreeFile.test_kind_character
 breezy.tests.test_workingtree.TestTreeLink.test_kind_character
+breezy.tests.test_workingtree.TestWorkingTreeFormat3.test_disk_layout
 breezy.tests.test_workingtree.TestWorkingTreeFormatRegistry.test_get_all
 breezy.tests.test_workingtree.TestWorkingTreeFormatRegistry.test_register_extra
 breezy.tests.test_workingtree.TestWorkingTreeFormatRegistry.test_register_extra_lazy
 breezy.tests.test_workingtree.TestWorkingTreeFormatRegistry.test_register_unregister_format
+breezy.tests.test_workingtree.TestWorkingTreeFormat.test_find_format
 breezy.tests.test_workingtree.TestWorkingTreeFormat.test_find_format_no_tree
 breezy.tests.test_workingtree.TestWorkingTreeFormat.test_find_format_unknown_format
 breezy.tests.test_workingtree.TestWorkingTreeFormat.test_find_format_with_features