Merge lp:~jelmer/brz/python3-h into lp:brz

[Jelmer Vernooij]

Fix some more tests on python3.

[Martin Packman (gz)]

Thanks!

[Martin Packman (gz)]

review: Approve

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

Running landing tests failed
https://ci.breezy-vcs.org/job/land-brz/196/

=== modified file 'breezy/generate_ids.py'
--- breezy/generate_ids.py	2018-02-18 19:18:40 +0000
+++ breezy/generate_ids.py	2018-06-22 01:37:16 +0000
@@ -82,7 +82,7 @@
     #    filesystems
     # 4) Removing starting '.' characters to prevent the file ids from
     #    being considered hidden.
-    ascii_word_only = _file_id_chars_re.sub('', name.lower()).encode('ascii')
+    ascii_word_only = _file_id_chars_re.sub('', name.lower()).encode('ascii', 'replace')
     short_no_dots = ascii_word_only.lstrip(b'.')[:20]
     return short_no_dots + _next_id_suffix()
 

=== modified file 'breezy/lockdir.py'
--- breezy/lockdir.py	2018-04-02 22:07:12 +0000
+++ breezy/lockdir.py	2018-06-22 01:37:16 +0000
@@ -775,7 +775,7 @@
         info = dict(
             hostname=get_host_name(),
             pid=str(os.getpid()),
-            nonce=rand_chars(20),
+            nonce=rand_chars(20).encode('ascii'),
             start_time=str(int(time.time())),
             user=get_username_for_lock_info(),
             )
@@ -803,7 +803,9 @@
             # there may not be much we can say
             return cls({})
         else:
-            return cls(stanza.as_dict())
+            ret = stanza.as_dict()
+            ret['nonce'] = ret['nonce'].encode('ascii')
+            return cls(ret)
 
     def __hash__(self):
         return id(self)

=== modified file 'breezy/merge.py'
--- breezy/merge.py	2018-06-21 23:03:42 +0000
+++ breezy/merge.py	2018-06-22 01:37:16 +0000
@@ -1454,7 +1454,7 @@
         this_lines = self.get_lines(self.this_tree, this_path, file_id)
         m3 = merge3.Merge3(base_lines, this_lines, other_lines,
                            is_cherrypick=self.cherrypick)
-        start_marker = "!START OF MERGE CONFLICT!" + "I HOPE THIS IS UNIQUE"
+        start_marker = b"!START OF MERGE CONFLICT!" + b"I HOPE THIS IS UNIQUE"
         if self.show_base is True:
             base_marker = '|' * 7
         else:
@@ -1462,15 +1462,15 @@
 
         def iter_merge3(retval):
             retval["text_conflicts"] = False
-            for line in m3.merge_lines(name_a = "TREE",
-                                       name_b = "MERGE-SOURCE",
-                                       name_base = "BASE-REVISION",
+            for line in m3.merge_lines(name_a = b"TREE",
+                                       name_b = b"MERGE-SOURCE",
+                                       name_base = b"BASE-REVISION",
                                        start_marker=start_marker,
                                        base_marker=base_marker,
                                        reprocess=self.reprocess):
                 if line.startswith(start_marker):
                     retval["text_conflicts"] = True
-                    yield line.replace(start_marker, '<' * 7)
+                    yield line.replace(start_marker, b'<' * 7)
                 else:
                     yield line
         retval = {}

=== modified file 'breezy/plugins/git/transportgit.py'
--- breezy/plugins/git/transportgit.py	2018-06-15 13:09:19 +0000
+++ breezy/plugins/git/transportgit.py	2018-06-22 01:37:16 +0000
@@ -99,8 +99,8 @@
         return "%s(%r)" % (self.__class__.__name__, self.transport)
 
     def _ensure_dir_exists(self, path):
-        for n in range(path.count("/")):
-            dirname = "/".join(path.split("/")[:n+1])
+        for n in range(path.count(b"/")):
+            dirname = b"/".join(path.split(b"/")[:n+1])
             try:
                 self.transport.mkdir(dirname)
             except FileExists:
@@ -354,7 +354,7 @@
         else:
             transport = self.transport
         self._ensure_dir_exists(name)
-        lockname = name + ".lock"
+        lockname = name + b".lock"
         try:
             local_path = self.transport.local_abspath(name)
         except NotLocalUrl:

=== modified file 'breezy/plugins/git/tree.py'
--- breezy/plugins/git/tree.py	2018-06-21 23:59:28 +0000
+++ breezy/plugins/git/tree.py	2018-06-22 01:37:16 +0000
@@ -59,7 +59,10 @@
     CURRENT_REVISION,
     NULL_REVISION,
     )
-from ...sixish import text_type
+from ...sixish import (
+    text_type,
+    viewitems,
+    )
 
 from .mapping import (
     mode_is_executable,

=== modified file 'breezy/plugins/upload/tests/test_upload.py'
--- breezy/plugins/upload/tests/test_upload.py	2018-06-22 01:37:16 +0000
+++ breezy/plugins/upload/tests/test_upload.py	2018-06-22 01:37:16 +0000
@@ -342,7 +342,7 @@
         self.run_bzr('branch branch other')
         self.modify_file('a', b'bar')
         other_tree = workingtree.WorkingTree.open('other')
-        self.set_file_content('a', 'baz', b'other/')
+        self.set_file_content('a', b'baz', 'other/')
         other_tree.commit('modify file a')
 
         self.run_bzr('merge -d branch other', retcode=1)

=== modified file 'breezy/testament.py'
--- breezy/testament.py	2018-06-22 01:37:16 +0000
+++ breezy/testament.py	2018-06-22 01:37:16 +0000
@@ -226,7 +226,7 @@
     include_root = False
     def _entry_to_line(self, path, ie):
         l = Testament._entry_to_line(self, path, ie)[:-1]
-        l += ' ' + ie.revision
+        l += ' ' + ie.revision.decode('ascii')
         l += {True: ' yes\n', False: ' no\n'}[ie.executable]
         return l
 

=== modified file 'breezy/tests/per_branch/test_locking.py'
--- breezy/tests/per_branch/test_locking.py	2017-08-26 13:58:53 +0000
+++ breezy/tests/per_branch/test_locking.py	2018-06-22 01:37:16 +0000
@@ -306,7 +306,7 @@
                 # This test does not apply, because this lockable refuses
                 # tokens.
                 return
-            different_branch_token = lock.token + 'xxx'
+            different_branch_token = lock.token + b'xxx'
             # Re-using the same lockable instance with a different branch token
             # will raise TokenMismatch.
             self.assertRaises(errors.TokenMismatch,
@@ -320,7 +320,7 @@
                 # This test does not apply, because this branch refuses
                 # tokens.
                 return
-            different_branch_token = lock.token + 'xxx'
+            different_branch_token = lock.token + b'xxx'
 
             new_branch = branch.controldir.open_branch()
             # We only want to test the relocking abilities of branch, so use the

=== modified file 'breezy/tests/per_branch/test_push.py'
--- breezy/tests/per_branch/test_push.py	2018-05-13 16:38:44 +0000
+++ breezy/tests/per_branch/test_push.py	2018-06-22 01:37:16 +0000
@@ -123,12 +123,12 @@
                 'Format does not support bound branches')
         other = bound.controldir.sprout('other').open_branch()
         try:
-            other.tags.set_tag('new-tag', 'some-rev')
+            other.tags.set_tag('new-tag', b'some-rev')
         except errors.TagsNotSupported:
             raise tests.TestNotApplicable('Format does not support tags')
         other.push(bound)
-        self.assertEqual({'new-tag': 'some-rev'}, bound.tags.get_tag_dict())
-        self.assertEqual({'new-tag': 'some-rev'}, master.tags.get_tag_dict())
+        self.assertEqual({'new-tag': b'some-rev'}, bound.tags.get_tag_dict())
+        self.assertEqual({'new-tag': b'some-rev'}, master.tags.get_tag_dict())
 
     def test_push_uses_read_lock(self):
         """Push should only need a read lock on the source side."""

=== modified file 'breezy/tests/per_branch/test_sprout.py'
--- breezy/tests/per_branch/test_sprout.py	2018-03-04 02:57:55 +0000
+++ breezy/tests/per_branch/test_sprout.py	2018-06-22 01:37:16 +0000
@@ -126,7 +126,7 @@
         builder.build_commit(message="Rev 1")
         source = builder.get_branch()
         try:
-            source.tags.set_tag('tag-a', 'missing-rev')
+            source.tags.set_tag('tag-a', b'missing-rev')
         except (errors.TagsNotSupported, errors.GhostTagsNotSupported):
             raise tests.TestNotApplicable(
                 'Branch format does not support tags or tags to ghosts.')
@@ -185,7 +185,7 @@
         if not tree.branch.repository._format.supports_ghosts:
             raise tests.TestNotApplicable(
                 "repository format does not support ghosts in mainline")
-        tree.set_parent_ids(["spooky"], allow_leftmost_as_ghost=True)
+        tree.set_parent_ids([b"spooky"], allow_leftmost_as_ghost=True)
         tree.add('')
         rev1 = tree.commit('msg1')
         tree.commit('msg2')

=== modified file 'breezy/tests/per_branch/test_tags.py'
--- breezy/tests/per_branch/test_tags.py	2018-05-13 16:38:44 +0000
+++ breezy/tests/per_branch/test_tags.py	2018-06-22 01:37:16 +0000
@@ -102,8 +102,8 @@
                     errors.GhostTagsNotSupported,
                     b.tags.set_tag, "ghost", "idontexist")
         else:
-            b.tags.set_tag("ghost", "idontexist")
-            self.assertEqual("idontexist", b.tags.lookup_tag("ghost"))
+            b.tags.set_tag("ghost", b"idontexist")
+            self.assertEqual(b"idontexist", b.tags.lookup_tag("ghost"))
 
     def test_no_such_tag(self):
         b = self.make_branch('b')

=== modified file 'breezy/tests/per_repository_vf/test_write_group.py'
--- breezy/tests/per_repository_vf/test_write_group.py	2018-06-14 12:13:00 +0000
+++ breezy/tests/per_repository_vf/test_write_group.py	2018-06-22 01:37:16 +0000
@@ -61,7 +61,7 @@
         self.addCleanup(trunk_repo.unlock)
         tree.branch.repository.fetch(trunk_repo, revision_id=b'rev-1')
         tree.set_parent_ids(['rev-1'])
-        return tree 
+        return tree
 
     def make_first_commit(self, repo):
         trunk = repo.controldir.create_branch()
@@ -335,7 +335,7 @@
         repo.start_write_group()
         # Add some content so this isn't an empty write group (which may return
         # 0 tokens)
-        repo.texts.add_lines(('file-id', 'revid'), (), ['lines'])
+        repo.texts.add_lines((b'file-id', b'revid'), (), [b'lines'])
         try:
             wg_tokens = repo.suspend_write_group()
         except errors.UnsuspendableWriteGroup:
@@ -359,8 +359,8 @@
         repo.start_write_group()
         # Add some content so this isn't an empty write group (which may return
         # 0 tokens)
-        text_key = ('file-id', 'revid')
-        repo.texts.add_lines(text_key, (), ['lines'])
+        text_key = (b'file-id', b'revid')
+        repo.texts.add_lines(text_key, (), [b'lines'])
         try:
             wg_tokens = repo.suspend_write_group()
         except errors.UnsuspendableWriteGroup:
@@ -386,14 +386,14 @@
         repo.start_write_group()
         # Add some content so this isn't an empty write group (which may return
         # 0 tokens)
-        first_key = ('file-id', 'revid')
-        repo.texts.add_lines(first_key, (), ['lines'])
+        first_key = (b'file-id', b'revid')
+        repo.texts.add_lines(first_key, (), [b'lines'])
         wg_tokens = repo.suspend_write_group()
         same_repo = self.reopen_repo(repo)
         same_repo.resume_write_group(wg_tokens)
         self.assertTrue(same_repo.is_in_write_group())
-        second_key = ('file-id', 'second-revid')
-        same_repo.texts.add_lines(second_key, (first_key,), ['more lines'])
+        second_key = (b'file-id', b'second-revid')
+        same_repo.texts.add_lines(second_key, (first_key,), [b'more lines'])
         try:
             new_wg_tokens = same_repo.suspend_write_group()
         except:
@@ -414,8 +414,8 @@
         repo.start_write_group()
         # Add some content so this isn't an empty write group (which may return
         # 0 tokens)
-        text_key = ('file-id', 'revid')
-        repo.texts.add_lines(text_key, (), ['lines'])
+        text_key = (b'file-id', b'revid')
+        repo.texts.add_lines(text_key, (), [b'lines'])
         wg_tokens = repo.suspend_write_group()
         same_repo = self.reopen_repo(repo)
         same_repo.resume_write_group(wg_tokens)
@@ -433,8 +433,8 @@
         repo.start_write_group()
         # Add some content so this isn't an empty write group (which may return
         # 0 tokens)
-        text_key = ('file-id', 'revid')
-        repo.texts.add_lines(text_key, (), ['lines'])
+        text_key = (b'file-id', b'revid')
+        repo.texts.add_lines(text_key, (), [b'lines'])
         wg_tokens = repo.suspend_write_group()
         self.assertEqual([], list(repo.texts.keys()))
 
@@ -445,8 +445,8 @@
         repo.start_write_group()
         # Add some content so this isn't an empty write group (which may return
         # 0 tokens)
-        text_key = ('file-id', 'revid')
-        repo.texts.add_lines(text_key, (), ['lines'])
+        text_key = (b'file-id', b'revid')
+        repo.texts.add_lines(text_key, (), [b'lines'])
         wg_tokens = repo.suspend_write_group()
         same_repo = self.reopen_repo(repo)
         same_repo.resume_write_group(wg_tokens)
@@ -460,8 +460,8 @@
         repo.start_write_group()
         # Add some content so this isn't an empty write group (which may return
         # 0 tokens)
-        text_key = ('file-id', 'revid')
-        repo.texts.add_lines(text_key, (), ['lines'])
+        text_key = (b'file-id', b'revid')
+        repo.texts.add_lines(text_key, (), [b'lines'])
         wg_tokens = repo.suspend_write_group()
         same_repo = self.reopen_repo(repo)
         same_repo.resume_write_group(wg_tokens)
@@ -475,8 +475,8 @@
         repo.start_write_group()
         # Add some content so this isn't an empty write group (which may return
         # 0 tokens)
-        text_key = ('file-id', 'revid')
-        repo.texts.add_lines(text_key, (), ['lines'])
+        text_key = (b'file-id', b'revid')
+        repo.texts.add_lines(text_key, (), [b'lines'])
         wg_tokens = repo.suspend_write_group()
         same_repo = self.reopen_repo(repo)
         same_repo.resume_write_group(wg_tokens)
@@ -493,15 +493,15 @@
         repo.start_write_group()
         # Add some content so this isn't an empty write group (which may return
         # 0 tokens)
-        text_key = ('file-id', 'revid')
-        repo.texts.add_lines(text_key, (), ['lines'])
+        text_key = (b'file-id', b'revid')
+        repo.texts.add_lines(text_key, (), [b'lines'])
         wg_tokens = repo.suspend_write_group()
         same_repo = self.reopen_repo(repo)
         same_repo.resume_write_group(wg_tokens)
         same_repo.commit_write_group()
         self.assertEqual([text_key], list(same_repo.texts.keys()))
         self.assertEqual(
-            'lines', same_repo.texts.get_record_stream([text_key],
+            b'lines', same_repo.texts.get_record_stream([text_key],
                 'unordered', True).next().get_bytes_as('fulltext'))
         self.assertRaises(
             errors.UnresumableWriteGroup, same_repo.resume_write_group,
@@ -514,34 +514,34 @@
         repo.start_write_group()
         # Add some content so this isn't an empty write group (which may return
         # 0 tokens)
-        first_key = ('file-id', 'revid')
-        repo.texts.add_lines(first_key, (), ['lines'])
+        first_key = (b'file-id', b'revid')
+        repo.texts.add_lines(first_key, (), [b'lines'])
         wg_tokens = repo.suspend_write_group()
         same_repo = self.reopen_repo(repo)
         same_repo.resume_write_group(wg_tokens)
-        second_key = ('file-id', 'second-revid')
-        same_repo.texts.add_lines(second_key, (first_key,), ['more lines'])
+        second_key = (b'file-id', b'second-revid')
+        same_repo.texts.add_lines(second_key, (first_key,), [b'more lines'])
         same_repo.commit_write_group()
         self.assertEqual(
             {first_key, second_key}, set(same_repo.texts.keys()))
         self.assertEqual(
-            'lines', same_repo.texts.get_record_stream([first_key],
+            b'lines', same_repo.texts.get_record_stream([first_key],
                 'unordered', True).next().get_bytes_as('fulltext'))
         self.assertEqual(
-            'more lines', same_repo.texts.get_record_stream([second_key],
+            b'more lines', same_repo.texts.get_record_stream([second_key],
                 'unordered', True).next().get_bytes_as('fulltext'))
 
     def make_source_with_delta_record(self):
         # Make a source repository with a delta record in it.
         source_repo = self.make_write_locked_repo('source')
         source_repo.start_write_group()
-        key_base = ('file-id', 'base')
-        key_delta = ('file-id', 'delta')
+        key_base = (b'file-id', b'base')
+        key_delta = (b'file-id', b'delta')
         def text_stream():
             yield versionedfile.FulltextContentFactory(
-                key_base, (), None, 'lines\n')
+                key_base, (), None, b'lines\n')
             yield versionedfile.FulltextContentFactory(
-                key_delta, (key_base,), None, 'more\nlines\n')
+                key_delta, (key_base,), None, b'more\nlines\n')
         source_repo.texts.insert_record_stream(text_stream())
         source_repo.commit_write_group()
         return source_repo
@@ -550,8 +550,8 @@
         self.require_suspendable_write_groups(
             'Cannot test resume on repo that does not support suspending')
         source_repo = self.make_source_with_delta_record()
-        key_base = ('file-id', 'base')
-        key_delta = ('file-id', 'delta')
+        key_base = (b'file-id', b'base')
+        key_delta = (b'file-id', b'delta')
         # Start a write group, insert just a delta.
         repo = self.make_write_locked_repo()
         repo.start_write_group()
@@ -570,7 +570,7 @@
             same_repo.lock_read()
             record = next(same_repo.texts.get_record_stream([key_delta],
                                                        'unordered', True))
-            self.assertEqual('more\nlines\n', record.get_bytes_as('fulltext'))
+            self.assertEqual(b'more\nlines\n', record.get_bytes_as('fulltext'))
             return
         # Merely suspending and resuming doesn't make it commitable either.
         wg_tokens = repo.suspend_write_group()
@@ -584,15 +584,15 @@
         self.require_suspendable_write_groups(
             'Cannot test resume on repo that does not support suspending')
         source_repo = self.make_source_with_delta_record()
-        key_base = ('file-id', 'base')
-        key_delta = ('file-id', 'delta')
+        key_base = (b'file-id', b'base')
+        key_delta = (b'file-id', b'delta')
         # Start a write group.
         repo = self.make_write_locked_repo()
         repo.start_write_group()
         # Add some content so this isn't an empty write group (which may return
         # 0 tokens)
-        text_key = ('file-id', 'revid')
-        repo.texts.add_lines(text_key, (), ['lines'])
+        text_key = (b'file-id', b'revid')
+        repo.texts.add_lines(text_key, (), [b'lines'])
         # Suspend it, then resume it.
         wg_tokens = repo.suspend_write_group()
         same_repo = self.reopen_repo(repo)
@@ -614,7 +614,7 @@
             same_repo.lock_read()
             record = next(same_repo.texts.get_record_stream([key_delta],
                                                        'unordered', True))
-            self.assertEqual('more\nlines\n', record.get_bytes_as('fulltext'))
+            self.assertEqual(b'more\nlines\n', record.get_bytes_as('fulltext'))
             return
         same_repo.abort_write_group()
 
@@ -622,8 +622,8 @@
         self.require_suspendable_write_groups(
             'Cannot test resume on repo that does not support suspending')
         source_repo = self.make_source_with_delta_record()
-        key_base = ('file-id', 'base')
-        key_delta = ('file-id', 'delta')
+        key_base = (b'file-id', b'base')
+        key_delta = (b'file-id', b'delta')
         # Start a write group, insert just a delta.
         repo = self.make_write_locked_repo()
         repo.start_write_group()

=== modified file 'breezy/tests/per_tree/test_get_root_id.py'
--- breezy/tests/per_tree/test_get_root_id.py	2018-03-25 00:39:16 +0000
+++ breezy/tests/per_tree/test_get_root_id.py	2018-06-22 01:37:16 +0000
@@ -32,7 +32,7 @@
         if not tree.supports_setting_file_ids():
             self.assertRaises(
                 SettingFileIdUnsupported, tree.set_root_id,
-                'custom-tree-root-id')
+                b'custom-tree-root-id')
             self.skipTest('tree format does not support setting tree id')
         tree.set_root_id(b'custom-tree-root-id')
         return self._convert_tree(tree)
@@ -45,5 +45,5 @@
     def test_get_root_id_fixed(self):
         tree = self.make_tree_with_fixed_root_id()
         with tree.lock_read():
-            self.assertEqual('custom-tree-root-id', tree.get_root_id())
+            self.assertEqual(b'custom-tree-root-id', tree.get_root_id())
 

=== modified file 'breezy/tests/per_workingtree/test_annotate_iter.py'
--- breezy/tests/per_workingtree/test_annotate_iter.py	2018-03-27 00:51:45 +0000
+++ breezy/tests/per_workingtree/test_annotate_iter.py	2018-06-22 01:37:16 +0000
@@ -25,7 +25,7 @@
         builder = self.make_branch_builder('branch')
         revid = builder.build_snapshot(None, [
             ('add', ('', None, 'directory', None)),
-            ('add', ('file', None, 'file', 'initial content\n')),
+            ('add', ('file', None, 'file', b'initial content\n')),
             ])
         b = builder.get_branch()
         tree = b.create_checkout('tree', lightweight=True)
@@ -71,10 +71,10 @@
                                    b'initial content\ncontent in 2\n'
                                    b'content in 3\nnew content\n')])
         annotations = tree.annotate_iter('file')
-        self.assertEqual([(revid1, 'initial content\n'),
-                          (revid2, 'content in 2\n'),
-                          (revid3, 'content in 3\n'),
-                          (b'current:', 'new content\n'),
+        self.assertEqual([(revid1, b'initial content\n'),
+                          (revid2, b'content in 2\n'),
+                          (revid3, b'content in 3\n'),
+                          (b'current:', b'new content\n'),
                          ], annotations)
 
     def test_annotate_merge_parent_no_file(self):
@@ -96,8 +96,8 @@
         self.build_tree_contents([('tree/file',
                                    b'initial content\nnew content\n')])
         annotations = tree.annotate_iter('file')
-        self.assertEqual([(revid2, 'initial content\n'),
-                          (b'current:', 'new content\n'),
+        self.assertEqual([(revid2, b'initial content\n'),
+                          (b'current:', b'new content\n'),
                          ], annotations)
 
     def test_annotate_merge_parent_was_directory(self):
@@ -121,8 +121,8 @@
         self.build_tree_contents([('tree/file',
                                    b'initial content\nnew content\n')])
         annotations = tree.annotate_iter('file')
-        self.assertEqual([(revid2, 'initial content\n'),
-                          (b'current:', 'new content\n'),
+        self.assertEqual([(revid2, b'initial content\n'),
+                          (b'current:', b'new content\n'),
                          ], annotations)
 
     def test_annotate_same_as_merge_parent(self):
@@ -146,8 +146,8 @@
         self.build_tree_contents([('tree/file',
                                    b'initial content\ncontent in 3\n')])
         annotations = tree.annotate_iter('file')
-        self.assertEqual([(revid1, 'initial content\n'),
-                          (revid3, 'content in 3\n'),
+        self.assertEqual([(revid1, b'initial content\n'),
+                          (revid3, b'content in 3\n'),
                          ], annotations)
 
     def test_annotate_same_as_merge_parent_supersedes(self):
@@ -155,16 +155,16 @@
         builder.start_series()
         revid1 = builder.build_snapshot(None, [
             ('add', ('', None, 'directory', None)),
-            ('add', ('file', None, 'file', 'initial content\n')),
+            ('add', ('file', None, 'file', b'initial content\n')),
             ])
         revid2 = builder.build_snapshot([revid1], [
-            ('modify', ('file', 'initial content\nnew content\n')),
+            ('modify', ('file', b'initial content\nnew content\n')),
             ])
         revid3 = builder.build_snapshot([revid2], [
-            ('modify', ('file', 'initial content\ncontent in 3\n')),
+            ('modify', ('file', b'initial content\ncontent in 3\n')),
             ])
         revid4 = builder.build_snapshot([revid3], [
-            ('modify', ('file', 'initial content\nnew content\n')),
+            ('modify', ('file', b'initial content\nnew content\n')),
             ])
         # In this case, the content locally is the same as content in basis
         # tree, but the merge revision states that *it* should win
@@ -175,7 +175,7 @@
         self.addCleanup(tree.unlock)
         tree.set_parent_ids([revid2, revid4])
         annotations = tree.annotate_iter('file')
-        self.assertEqual([(revid1, 'initial content\n'),
-                          (revid4, 'new content\n'),
+        self.assertEqual([(revid1, b'initial content\n'),
+                          (revid4, b'new content\n'),
                          ], annotations)
 

=== modified file 'breezy/tests/per_workingtree/test_executable.py'
--- breezy/tests/per_workingtree/test_executable.py	2018-05-13 16:38:44 +0000
+++ breezy/tests/per_workingtree/test_executable.py	2018-06-22 01:37:16 +0000
@@ -34,8 +34,8 @@
         wt = self.make_branch_and_tree('b1')
         b = wt.branch
         tt = TreeTransform(wt)
-        tt.new_file('a', tt.root, b'a test\n', self.a_id, True)
-        tt.new_file('b', tt.root, b'b test\n', self.b_id, False)
+        tt.new_file('a', tt.root, [b'a test\n'], self.a_id, True)
+        tt.new_file('b', tt.root, [b'b test\n'], self.b_id, False)
         tt.apply()
 
         self.wt = wt

=== modified file 'breezy/tests/per_workingtree/test_put_file.py'
--- breezy/tests/per_workingtree/test_put_file.py	2018-06-16 13:09:13 +0000
+++ breezy/tests/per_workingtree/test_put_file.py	2018-06-22 01:37:16 +0000
@@ -26,12 +26,14 @@
         t = self.make_branch_and_tree('t1')
         t.add(['foo'], kinds=['file'])
         t.put_file_bytes_non_atomic('foo', b'barshoom')
-        self.assertEqual(b'barshoom', t.get_file('foo').read())
+        with t.get_file('foo') as f:
+            self.assertEqual(b'barshoom', f.read())
 
     def test_put_existing_file(self):
         t = self.make_branch_and_tree('t1')
         t.add(['foo'], kinds=['file'])
         t.put_file_bytes_non_atomic('foo', b'first-content')
         t.put_file_bytes_non_atomic('foo', b'barshoom')
-        self.assertEqual(b'barshoom', t.get_file('foo').read())
+        with t.get_file('foo') as f:
+            self.assertEqual(b'barshoom', f.read())
 

=== modified file 'breezy/tests/test_chk_serializer.py'
--- breezy/tests/test_chk_serializer.py	2017-06-08 23:30:31 +0000
+++ breezy/tests/test_chk_serializer.py	2018-06-22 01:37:16 +0000
@@ -22,36 +22,36 @@
     )
 from . import TestCase
 
-_working_revision_bencode1 = ('l'
-    'l6:formati10ee'
-    'l9:committer54:Canonical.com Patch Queue Manager <[e-mail]>e'
-    'l8:timezonei3600ee'
-    'l10:propertiesd11:branch-nick6:+trunkee'
-    'l9:timestamp14:1242300770.844e'
-    'l11:revision-id50:[e-mail]-20090514113250-jntkkpminfn3e0tze'
-    'l10:parent-ids'
-        'l'
-        '50:[e-mail]-20090514104039-kggemn7lrretzpvc'
-        '48:[e-mail]-20090510012654-jp9ufxquekaokbeo'
-        'ee'
-    'l14:inventory-sha140:4a2c7fb50e077699242cf6eb16a61779c7b680a7e'
-    'l7:message35:(Jelmer) Move dpush to InterBranch.e'
-    'e')
+_working_revision_bencode1 = (b'l'
+    b'l6:formati10ee'
+    b'l9:committer54:Canonical.com Patch Queue Manager <[e-mail]>e'
+    b'l8:timezonei3600ee'
+    b'l10:propertiesd11:branch-nick6:+trunkee'
+    b'l9:timestamp14:1242300770.844e'
+    b'l11:revision-id50:[e-mail]-20090514113250-jntkkpminfn3e0tze'
+    b'l10:parent-ids'
+        b'l'
+        b'50:[e-mail]-20090514104039-kggemn7lrretzpvc'
+        b'48:[e-mail]-20090510012654-jp9ufxquekaokbeo'
+        b'ee'
+    b'l14:inventory-sha140:4a2c7fb50e077699242cf6eb16a61779c7b680a7e'
+    b'l7:message35:(Jelmer) Move dpush to InterBranch.e'
+    b'e')
 
-_working_revision_bencode1_no_timezone = ('l'
-    'l6:formati10ee'
-    'l9:committer54:Canonical.com Patch Queue Manager <[e-mail]>e'
-    'l9:timestamp14:1242300770.844e'
-    'l10:propertiesd11:branch-nick6:+trunkee'
-    'l11:revision-id50:[e-mail]-20090514113250-jntkkpminfn3e0tze'
-    'l10:parent-ids'
-        'l'
-        '50:[e-mail]-20090514104039-kggemn7lrretzpvc'
-        '48:[e-mail]-20090510012654-jp9ufxquekaokbeo'
-        'ee'
-    'l14:inventory-sha140:4a2c7fb50e077699242cf6eb16a61779c7b680a7e'
-    'l7:message35:(Jelmer) Move dpush to InterBranch.e'
-    'e')
+_working_revision_bencode1_no_timezone = (b'l'
+    b'l6:formati10ee'
+    b'l9:committer54:Canonical.com Patch Queue Manager <[e-mail]>e'
+    b'l9:timestamp14:1242300770.844e'
+    b'l10:propertiesd11:branch-nick6:+trunkee'
+    b'l11:revision-id50:[e-mail]-20090514113250-jntkkpminfn3e0tze'
+    b'l10:parent-ids'
+        b'l'
+        b'50:[e-mail]-20090514104039-kggemn7lrretzpvc'
+        b'48:[e-mail]-20090510012654-jp9ufxquekaokbeo'
+        b'ee'
+    b'l14:inventory-sha140:4a2c7fb50e077699242cf6eb16a61779c7b680a7e'
+    b'l7:message35:(Jelmer) Move dpush to InterBranch.e'
+    b'e')
 
 
 class TestBEncodeSerializer1(TestCase):
@@ -91,19 +91,19 @@
         self.assertEqual(orig_rev, new_rev)
 
     def test_roundtrips_non_ascii(self):
-        rev = Revision("revid1")
+        rev = Revision(b"revid1")
         rev.message = u"\n\xe5me"
         rev.committer = u'Erik B\xe5gfors'
         rev.timestamp = 1242385452
-        rev.inventory_sha1 = "4a2c7fb50e077699242cf6eb16a61779c7b680a7"
+        rev.inventory_sha1 = b"4a2c7fb50e077699242cf6eb16a61779c7b680a7"
         rev.timezone = 3600
         self.assertRoundTrips(chk_bencode_serializer, rev)
 
     def test_roundtrips_xml_invalid_chars(self):
-        rev = Revision("revid1")
+        rev = Revision(b"revid1")
         rev.message = "\t\ue000"
         rev.committer = u'Erik B\xe5gfors'
         rev.timestamp = 1242385452
         rev.timezone = 3600
-        rev.inventory_sha1 = "4a2c7fb50e077699242cf6eb16a61779c7b680a7"
+        rev.inventory_sha1 = b"4a2c7fb50e077699242cf6eb16a61779c7b680a7"
         self.assertRoundTrips(chk_bencode_serializer, rev)

=== modified file 'breezy/tests/test_clean_tree.py'
--- breezy/tests/test_clean_tree.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/test_clean_tree.py	2018-06-22 01:37:16 +0000
@@ -57,14 +57,13 @@
         os.mkdir('branch')
         tree = ControlDir.create_standalone_workingtree('branch')
         transport = tree.controldir.root_transport
-        transport.put_bytes('.bzrignore', '*~\n*.pyc\n.bzrignore\n')
-        transport.put_bytes('file.BASE', 'contents')
-        tree.lock_write()
-        try:
+        transport.put_bytes('.bzrignore', b'*~\n*.pyc\n.bzrignore\n')
+        transport.put_bytes('file.BASE', b'contents')
+        with tree.lock_write():
             self.assertEqual(len(list(iter_deletables(tree, unknown=True))), 1)
-            transport.put_bytes('file', 'contents')
-            transport.put_bytes('file~', 'contents')
-            transport.put_bytes('file.pyc', 'contents')
+            transport.put_bytes('file', b'contents')
+            transport.put_bytes('file~', b'contents')
+            transport.put_bytes('file.pyc', b'contents')
             dels = sorted([r for a, r in iter_deletables(tree, unknown=True)])
             self.assertEqual(['file', 'file.BASE'], dels)
 
@@ -77,8 +76,6 @@
 
             dels = [r for a, r in iter_deletables(tree, unknown=False)]
             self.assertEqual([], dels)
-        finally:
-            tree.unlock()
 
     def test_delete_items_warnings(self):
         """Ensure delete_items issues warnings on EACCES. (bug #430785)

=== modified file 'breezy/tests/test_commit.py'
--- breezy/tests/test_commit.py	2018-06-22 01:37:16 +0000
+++ breezy/tests/test_commit.py	2018-06-22 01:37:16 +0000
@@ -219,7 +219,7 @@
         with open('hello', 'w') as f: f.write('hello')
         with open('buongia', 'w') as f: f.write('buongia')
         wt.add(['hello', 'buongia'],
-              ['hello-id', 'buongia-id'])
+              [b'hello-id', b'buongia-id'])
         wt.commit(message='add files',
                  rev_id=b'test@rev-1')
 
@@ -428,7 +428,7 @@
             from ..testament import Testament
             # monkey patch gpg signing mechanism
             breezy.gpg.GPGStrategy = breezy.gpg.LoopbackGPGStrategy
-            conf = config.MemoryStack('''
+            conf = config.MemoryStack(b'''
 create_signatures=always
 ''')
             commit.Commit(config_stack=conf).commit(
@@ -454,7 +454,7 @@
         try:
             # monkey patch gpg signing mechanism
             breezy.gpg.GPGStrategy = breezy.gpg.DisabledGPGStrategy
-            conf = config.MemoryStack('''
+            conf = config.MemoryStack(b'''
 create_signatures=always
 ''')
             self.assertRaises(breezy.gpg.SigningFailed,
@@ -478,7 +478,7 @@
             calls.append('called')
         breezy.ahook = called
         try:
-            conf = config.MemoryStack('post_commit=breezy.ahook breezy.ahook')
+            conf = config.MemoryStack(b'post_commit=breezy.ahook breezy.ahook')
             commit.Commit(config_stack=conf).commit(
                 message = "base", allow_pointless=True, rev_id=b'A',
                 working_tree = wt)
@@ -758,7 +758,7 @@
         tree = self.make_branch_and_tree('foo')
         # pending merge would turn into a left parent
         tree.commit('commit 1')
-        tree.add_parent_tree_id('example')
+        tree.add_parent_tree_id(b'example')
         self.build_tree(['foo/bar', 'foo/baz'])
         tree.add(['bar', 'baz'])
         err = self.assertRaises(CannotCommitSelectedFileMerge,

=== modified file 'breezy/tests/test_config.py'
--- breezy/tests/test_config.py	2018-06-22 01:37:16 +0000
+++ breezy/tests/test_config.py	2018-06-22 01:37:16 +0000
@@ -395,7 +395,7 @@
         return 'vimdiff -fo @new_path @old_path'
 
 
-bool_config = """[DEFAULT]
+bool_config = b"""[DEFAULT]
 active = true
 inactive = false
 [UPPERCASE]
@@ -423,7 +423,7 @@
         outfile = BytesIO()
         co.write(outfile=outfile)
         lines = outfile.getvalue().splitlines()
-        self.assertEqual(lines, ['test = "foo#bar"'])
+        self.assertEqual(lines, [b'test = "foo#bar"'])
         co2 = config.ConfigObj(lines)
         self.assertEqual(co2['test'], 'foo#bar')
 
@@ -1628,14 +1628,14 @@
     def test_load_non_ascii(self):
         """Ensure we display a proper error on non-ascii, non utf-8 content."""
         t = self.get_transport()
-        t.put_bytes('foo.conf', 'user=foo\n#\xff\n')
+        t.put_bytes('foo.conf', b'user=foo\n#\xff\n')
         conf = config.TransportConfig(t, 'foo.conf')
         self.assertRaises(config.ConfigContentError, conf._get_configobj)
 
     def test_load_erroneous_content(self):
         """Ensure we display a proper error on content that can't be parsed."""
         t = self.get_transport()
-        t.put_bytes('foo.conf', '[open_section\n')
+        t.put_bytes('foo.conf', b'[open_section\n')
         conf = config.TransportConfig(t, 'foo.conf')
         self.assertRaises(config.ParseConfigError, conf._get_configobj)
 
@@ -2552,14 +2552,14 @@
     def test_load_non_ascii(self):
         """Ensure we display a proper error on non-ascii, non utf-8 content."""
         t = self.get_transport()
-        t.put_bytes('foo.conf', 'user=foo\n#%s\n' % (self.invalid_utf8_char,))
+        t.put_bytes('foo.conf', b'user=foo\n#%s\n' % (self.invalid_utf8_char,))
         store = config.TransportIniFileStore(t, 'foo.conf')
         self.assertRaises(config.ConfigContentError, store.load)
 
     def test_load_erroneous_content(self):
         """Ensure we display a proper error on content that can't be parsed."""
         t = self.get_transport()
-        t.put_bytes('foo.conf', '[open_section\n')
+        t.put_bytes('foo.conf', b'[open_section\n')
         store = config.TransportIniFileStore(t, 'foo.conf')
         self.assertRaises(config.ParseConfigError, store.load)
 
@@ -3350,9 +3350,9 @@
 
     def test_get_first_definition(self):
         store1 = config.IniFileStore()
-        store1._load_from_string('foo=bar')
+        store1._load_from_string(b'foo=bar')
         store2 = config.IniFileStore()
-        store2._load_from_string('foo=baz')
+        store2._load_from_string(b'foo=baz')
         conf = config.Stack([store1.get_sections, store2.get_sections])
         self.assertEqual('bar', conf.get('foo'))
 
@@ -4153,7 +4153,7 @@
     def setUp(self):
         super(TestAuthenticationConfigFilePermissions, self).setUp()
         self.path = osutils.pathjoin(self.test_dir, 'authentication.conf')
-        with open(self.path, 'w') as f:
+        with open(self.path, 'wb') as f:
             f.write(b"""[broken]
 scheme=ftp
 user=joe

=== modified file 'breezy/tests/test_diff.py'
--- breezy/tests/test_diff.py	2018-06-22 01:37:16 +0000
+++ breezy/tests/test_diff.py	2018-06-22 01:37:16 +0000
@@ -564,12 +564,12 @@
         tree = self.make_branch_and_tree('tree')
 
         tt = transform.TreeTransform(tree)
-        tt.new_file('a', tt.root, 'contents\n', 'a-id', True)
-        tt.new_file('b', tt.root, 'contents\n', 'b-id', False)
-        tt.new_file('c', tt.root, 'contents\n', 'c-id', True)
-        tt.new_file('d', tt.root, 'contents\n', 'd-id', False)
-        tt.new_file('e', tt.root, 'contents\n', 'control-e-id', True)
-        tt.new_file('f', tt.root, 'contents\n', 'control-f-id', False)
+        tt.new_file('a', tt.root, ['contents\n'], b'a-id', True)
+        tt.new_file('b', tt.root, ['contents\n'], b'b-id', False)
+        tt.new_file('c', tt.root, ['contents\n'], b'c-id', True)
+        tt.new_file('d', tt.root, ['contents\n'], b'd-id', False)
+        tt.new_file('e', tt.root, ['contents\n'], b'control-e-id', True)
+        tt.new_file('f', tt.root, ['contents\n'], b'control-f-id', False)
         tt.apply()
         tree.commit('one', rev_id=b'rev-1')
 

=== modified file 'breezy/tests/test_generate_ids.py'
--- breezy/tests/test_generate_ids.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/test_generate_ids.py	2018-06-22 01:37:16 +0000
@@ -104,7 +104,7 @@
     def test_gen_root_id(self):
         # Mostly just make sure gen_root_id() exists
         root_id = generate_ids.gen_root_id()
-        self.assertStartsWith(root_id, 'tree_root-')
+        self.assertStartsWith(root_id, b'tree_root-')
 
 
 class TestGenRevisionId(tests.TestCase):

=== modified file 'breezy/tests/test_lockable_files.py'
--- breezy/tests/test_lockable_files.py	2017-08-27 22:42:47 +0000
+++ breezy/tests/test_lockable_files.py	2018-06-22 01:37:16 +0000
@@ -119,7 +119,7 @@
             # This test does not apply, because this lockable refuses
             # tokens.
             return
-        different_token = token + 'xxx'
+        different_token = token + b'xxx'
         # Re-using the same lockable instance with a different token will
         # raise TokenMismatch.
         self.assertRaises(errors.TokenMismatch,

=== modified file 'breezy/tests/test_merge_core.py'
--- breezy/tests/test_merge_core.py	2018-06-22 01:37:16 +0000
+++ breezy/tests/test_merge_core.py	2018-06-22 01:37:16 +0000
@@ -72,7 +72,7 @@
                  base=True, other=True):
         def new_file(tt):
             parent_id = tt.trans_id_file_id(parent)
-            tt.new_file(name, parent_id, contents, id, executable)
+            tt.new_file(name, parent_id, [contents], id, executable)
         for option, tt in self.selected_transforms(this, base, other):
             if option is True:
                 new_file(tt)
@@ -160,7 +160,7 @@
         for contents, tt in self.selected_transforms(this, base, other):
             trans_id = tt.trans_id_file_id(file_id)
             tt.cancel_creation(trans_id)
-            tt.create_file(contents, trans_id)
+            tt.create_file([contents], trans_id)
 
     def change_target(self, id, base=None, this=None, other=None):
         for target, tt in self.selected_transforms(this, base, other):
@@ -230,56 +230,56 @@
     def test_change_name(self):
         """Test renames"""
         builder = MergeBuilder(getcwd())
-        builder.add_file("1", builder.tree_root, "name1", "hello1", True)
-        builder.change_name("1", other="name2")
-        builder.add_file("2", builder.tree_root, "name3", "hello2", True)
-        builder.change_name("2", base="name4")
-        builder.add_file("3", builder.tree_root, "name5", "hello3", True)
-        builder.change_name("3", this="name6")
+        builder.add_file(b"1", builder.tree_root, "name1", b"hello1", True)
+        builder.change_name(b"1", other="name2")
+        builder.add_file(b"2", builder.tree_root, "name3", b"hello2", True)
+        builder.change_name(b"2", base="name4")
+        builder.add_file(b"3", builder.tree_root, "name5", b"hello3", True)
+        builder.change_name(b"3", this="name6")
         builder.merge()
         builder.cleanup()
         builder = MergeBuilder(getcwd())
-        builder.add_file("1", builder.tree_root, "name1", "hello1", False)
-        builder.change_name("1", other="name2", this="name3")
+        builder.add_file(b"1", builder.tree_root, "name1", b"hello1", False)
+        builder.change_name(b"1", other="name2", this="name3")
         conflicts = builder.merge()
-        self.assertEqual(conflicts, [PathConflict('name3', 'name2', '1')])
+        self.assertEqual(conflicts, [PathConflict('name3', 'name2', b'1')])
         builder.cleanup()
 
     def test_merge_one(self):
         builder = MergeBuilder(getcwd())
-        builder.add_file("1", builder.tree_root, "name1", "hello1", True)
-        builder.change_contents("1", other="text4")
-        builder.add_file("2", builder.tree_root, "name2", "hello1", True)
-        builder.change_contents("2", other="text4")
+        builder.add_file(b"1", builder.tree_root, "name1", b"hello1", True)
+        builder.change_contents(b"1", other=b"text4")
+        builder.add_file(b"2", builder.tree_root, "name2", b"hello1", True)
+        builder.change_contents(b"2", other=b"text4")
         builder.merge(interesting_files=["name1"])
-        self.assertEqual(builder.this.get_file("name1").read(), "text4" )
-        self.assertEqual(builder.this.get_file("name2").read(), "hello1" )
+        self.assertEqual(builder.this.get_file("name1").read(), b"text4" )
+        self.assertEqual(builder.this.get_file("name2").read(), b"hello1" )
         builder.cleanup()
 
     def test_file_moves(self):
         """Test moves"""
         builder = MergeBuilder(getcwd())
-        builder.add_dir("1", builder.tree_root, "dir1")
-        builder.add_dir("2", builder.tree_root, "dir2")
-        builder.add_file("3", "1", "file1", "hello1", True)
-        builder.add_file("4", "1", "file2", "hello2", True)
-        builder.add_file("5", "1", "file3", "hello3", True)
-        builder.change_parent("3", other="2")
-        builder.change_parent("4", this="2")
-        builder.change_parent("5", base="2")
+        builder.add_dir(b"1", builder.tree_root, "dir1")
+        builder.add_dir(b"2", builder.tree_root, "dir2")
+        builder.add_file(b"3", "1", "file1", b"hello1", True)
+        builder.add_file(b"4", "1", "file2", b"hello2", True)
+        builder.add_file(b"5", "1", "file3", b"hello3", True)
+        builder.change_parent(b"3", other="2")
+        builder.change_parent(b"4", this="2")
+        builder.change_parent(b"5", base="2")
         builder.merge()
         builder.cleanup()
 
         builder = MergeBuilder(getcwd())
-        builder.add_dir("1", builder.tree_root, "dir1")
-        builder.add_dir("2", builder.tree_root, "dir2")
-        builder.add_dir("3", builder.tree_root, "dir3")
-        builder.add_file("4", "1", "file1", "hello1", False)
-        builder.change_parent("4", other="2", this="3")
+        builder.add_dir(b"1", builder.tree_root, "dir1")
+        builder.add_dir(b"2", builder.tree_root, "dir2")
+        builder.add_dir(b"3", builder.tree_root, "dir3")
+        builder.add_file(b"4", "1", "file1", b"hello1", False)
+        builder.change_parent(b"4", other="2", this="3")
         conflicts = builder.merge()
         path2 = pathjoin('dir2', 'file1')
         path3 = pathjoin('dir3', 'file1')
-        self.assertEqual(conflicts, [PathConflict(path3, path2, '4')])
+        self.assertEqual(conflicts, [PathConflict(path3, path2, b'4')])
         builder.cleanup()
 
     def test_contents_merge(self):
@@ -303,10 +303,10 @@
     def test_reprocess_weave(self):
         # Reprocess works on weaves, and behaves as expected
         builder = MergeBuilder(getcwd())
-        builder.add_file('a', builder.tree_root, 'blah', 'a', False)
-        builder.change_contents('a', this='b\nc\nd\ne\n', other='z\nc\nd\ny\n')
+        builder.add_file(b'a', builder.tree_root, 'blah', b'a', False)
+        builder.change_contents(b'a', this=b'b\nc\nd\ne\n', other=b'z\nc\nd\ny\n')
         builder.merge(WeaveMerger, reprocess=True)
-        expected = """<<<<<<< TREE
+        expected = b"""<<<<<<< TREE
 b
 =======
 z
@@ -332,23 +332,23 @@
 
     def contents_test_success(self, merge_factory):
         builder = MergeBuilder(getcwd())
-        builder.add_file("1", builder.tree_root, "name1", "text1", True)
-        builder.change_contents("1", other="text4")
-        builder.add_file("2", builder.tree_root, "name3", "text2", False)
-        builder.change_contents("2", base="text5")
-        builder.add_file("3", builder.tree_root, "name5", "text3", True)
-        builder.add_file("4", builder.tree_root, "name6", "text4", True)
-        builder.remove_file("4", base=True)
-        builder.add_file("5", builder.tree_root, "name7", "a\nb\nc\nd\ne\nf\n",
+        builder.add_file(b"1", builder.tree_root, "name1", b"text1", True)
+        builder.change_contents(b"1", other=b"text4")
+        builder.add_file(b"2", builder.tree_root, "name3", b"text2", False)
+        builder.change_contents(b"2", base=b"text5")
+        builder.add_file(b"3", builder.tree_root, "name5", b"text3", True)
+        builder.add_file(b"4", builder.tree_root, "name6", b"text4", True)
+        builder.remove_file(b"4", base=True)
+        builder.add_file(b"5", builder.tree_root, "name7", b"a\nb\nc\nd\ne\nf\n",
                          True)
-        builder.change_contents("5", other="a\nz\nc\nd\ne\nf\n",
-                                     this="a\nb\nc\nd\ne\nz\n")
+        builder.change_contents(b"5", other=b"a\nz\nc\nd\ne\nf\n",
+                                     this=b"a\nb\nc\nd\ne\nz\n")
         conflicts = builder.merge(merge_factory)
         try:
             self.assertEqual([], conflicts)
-            self.assertEqual("text4", builder.this.get_file("name1").read())
-            self.assertEqual("text2", builder.this.get_file("name3").read())
-            self.assertEqual("a\nz\nc\nd\ne\nz\n",
+            self.assertEqual(b"text4", builder.this.get_file("name1").read())
+            self.assertEqual(b"text2", builder.this.get_file("name3").read())
+            self.assertEqual(b"a\nz\nc\nd\ne\nz\n",
                              builder.this.get_file("name7").read())
             self.assertTrue(builder.this.is_executable("name1"))
             self.assertFalse(builder.this.is_executable("name3"))
@@ -360,18 +360,18 @@
 
     def contents_test_conflicts(self, merge_factory):
         builder = MergeBuilder(getcwd())
-        builder.add_file("1", builder.tree_root, "name1", "text1", True)
-        builder.change_contents("1", other="text4", this="text3")
-        builder.add_file("2", builder.tree_root, "name2", "text1", True)
-        builder.change_contents("2", other="\x00", this="text3")
-        builder.add_file("3", builder.tree_root, "name3", "text5", False)
-        builder.change_perms("3", this=True)
-        builder.change_contents('3', this='moretext')
-        builder.remove_file('3', other=True)
+        builder.add_file(b"1", builder.tree_root, "name1", b"text1", True)
+        builder.change_contents("1", other=b"text4", this=b"text3")
+        builder.add_file(b"2", builder.tree_root, "name2", b"text1", True)
+        builder.change_contents("2", other=b"\x00", this="text3")
+        builder.add_file(b"3", builder.tree_root, "name3", b"text5", False)
+        builder.change_perms(b"3", this=True)
+        builder.change_contents(b'3', this=b'moretext')
+        builder.remove_file(b'3', other=True)
         conflicts = builder.merge(merge_factory)
-        self.assertEqual(conflicts, [TextConflict('name1', file_id='1'),
-                                     ContentsConflict('name2', file_id='2'),
-                                     ContentsConflict('name3', file_id='3')])
+        self.assertEqual(conflicts, [TextConflict('name1', file_id=b'1'),
+                                     ContentsConflict('name2', file_id=b'2'),
+                                     ContentsConflict('name3', file_id=b'3')])
         self.assertEqual(
             builder.this.get_file(builder.this.id2path(b'2')).read(),
             '\x00')
@@ -380,22 +380,22 @@
     def test_symlink_conflicts(self):
         if sys.platform != "win32":
             builder = MergeBuilder(getcwd())
-            builder.add_symlink("2", builder.tree_root, "name2", "target1")
-            builder.change_target("2", other="target4", base="text3")
+            builder.add_symlink(b"2", builder.tree_root, "name2", "target1")
+            builder.change_target(b"2", other="target4", base="text3")
             conflicts = builder.merge()
             self.assertEqual(conflicts, [ContentsConflict('name2',
-                                                          file_id='2')])
+                                                          file_id=b'2')])
             builder.cleanup()
 
     def test_symlink_merge(self):
         if sys.platform != "win32":
             builder = MergeBuilder(getcwd())
-            builder.add_symlink("1", builder.tree_root, "name1", "target1")
-            builder.add_symlink("2", builder.tree_root, "name2", "target1")
-            builder.add_symlink("3", builder.tree_root, "name3", "target1")
-            builder.change_target("1", this="target2")
-            builder.change_target("2", base="target2")
-            builder.change_target("3", other="target2")
+            builder.add_symlink(b"1", builder.tree_root, "name1", "target1")
+            builder.add_symlink(b"2", builder.tree_root, "name2", "target1")
+            builder.add_symlink(b"3", builder.tree_root, "name3", "target1")
+            builder.change_target(b"1", this="target2")
+            builder.change_target(b"2", base="target2")
+            builder.change_target(b"3", other="target2")
             builder.merge()
             self.assertEqual(builder.this.get_symlink_target("name1"), "target2")
             self.assertEqual(builder.this.get_symlink_target("name2"), "target1")
@@ -404,22 +404,22 @@
 
     def test_no_passive_add(self):
         builder = MergeBuilder(getcwd())
-        builder.add_file("1", builder.tree_root, "name1", "text1", True)
-        builder.remove_file("1", this=True)
+        builder.add_file(b"1", builder.tree_root, "name1", b"text1", True)
+        builder.remove_file(b"1", this=True)
         builder.merge()
         builder.cleanup()
 
     def test_perms_merge(self):
         builder = MergeBuilder(getcwd())
-        builder.add_file("1", builder.tree_root, "name1", "text1", True)
-        builder.change_perms("1", other=False)
-        builder.add_file("2", builder.tree_root, "name2", "text2", True)
-        builder.change_perms("2", base=False)
-        builder.add_file("3", builder.tree_root, "name3", "text3", True)
-        builder.change_perms("3", this=False)
-        builder.add_file('4', builder.tree_root, 'name4', 'text4', False)
-        builder.change_perms('4', this=True)
-        builder.remove_file('4', base=True)
+        builder.add_file(b"1", builder.tree_root, "name1", b"text1", True)
+        builder.change_perms(b"1", other=False)
+        builder.add_file(b"2", builder.tree_root, "name2", b"text2", True)
+        builder.change_perms(b"2", base=False)
+        builder.add_file(b"3", builder.tree_root, "name3", b"text3", True)
+        builder.change_perms(b"3", this=False)
+        builder.add_file(b'4', builder.tree_root, 'name4', b'text4', False)
+        builder.change_perms(b'4', this=True)
+        builder.remove_file(b'4', base=True)
         builder.merge()
         self.assertIs(builder.this.is_executable("name1"), False)
         self.assertIs(builder.this.is_executable("name2"), True)
@@ -428,18 +428,18 @@
 
     def test_new_suffix(self):
         builder = MergeBuilder(getcwd())
-        builder.add_file("1", builder.tree_root, "name1", "text1", True)
-        builder.change_contents("1", other="text3")
-        builder.add_file("2", builder.tree_root, "name1.new", "text2", True)
+        builder.add_file(b"1", builder.tree_root, "name1", b"text1", True)
+        builder.change_contents(b"1", other=b"text3")
+        builder.add_file(b"2", builder.tree_root, "name1.new", b"text2", True)
         builder.merge()
-        os.lstat(builder.this.abspath(builder.this.id2path("2")))
+        os.lstat(builder.this.abspath(builder.this.id2path(b"2")))
         builder.cleanup()
 
     def test_spurious_conflict(self):
         builder = MergeBuilder(getcwd())
-        builder.add_file("1", builder.tree_root, "name1", "text1", False)
-        builder.remove_file("1", other=True)
-        builder.add_file("2", builder.tree_root, "name1", "text1", False,
+        builder.add_file(b"1", builder.tree_root, "name1", b"text1", False)
+        builder.remove_file(b"1", other=True)
+        builder.add_file(b"2", builder.tree_root, "name1", b"text1", False,
                          this=False, base=False)
         conflicts = builder.merge()
         self.assertEqual(conflicts, [])
@@ -447,11 +447,11 @@
 
     def test_merge_one_renamed(self):
         builder = MergeBuilder(getcwd())
-        builder.add_file('1', builder.tree_root, 'name1', 'text1a', False)
-        builder.change_name('1', this='name2')
-        builder.change_contents('1', other='text2')
+        builder.add_file(b'1', builder.tree_root, 'name1', b'text1a', False)
+        builder.change_name(b'1', this='name2')
+        builder.change_contents(b'1', other=b'text2')
         builder.merge(interesting_files=['name2'])
-        self.assertEqual('text2', builder.this.get_file('name2').read())
+        self.assertEqual(b'text2', builder.this.get_file('name2').read())
         builder.cleanup()
 
 
@@ -525,22 +525,22 @@
         # It isn't trivial to create foo.BASE because it tries to look up
         # attributes like 'executable' in A.
         builder.build_snapshot(None, [
-            ('add', ('', 'TREE_ROOT', 'directory', None))],
+            ('add', ('', b'TREE_ROOT', 'directory', None))],
             revision_id=b'A-id')
-        builder.build_snapshot(['A-id'], [], revision_id=b'B-id')
-        builder.build_snapshot(['A-id'], [
-            ('add', ('foo', 'foo-id', 'file', 'orig\ncontents\n'))],
+        builder.build_snapshot([b'A-id'], [], revision_id=b'B-id')
+        builder.build_snapshot([b'A-id'], [
+            ('add', ('foo', b'foo-id', 'file', b'orig\ncontents\n'))],
             revision_id=b'C-id')
-        builder.build_snapshot(['B-id', 'C-id'], [
-            ('add', ('foo', 'foo-id', 'file', 'orig\ncontents\nand D\n'))],
+        builder.build_snapshot([b'B-id', b'C-id'], [
+            ('add', ('foo', b'foo-id', 'file', b'orig\ncontents\nand D\n'))],
             revision_id=b'D-id')
-        builder.build_snapshot(['C-id', 'B-id'], [
-            ('modify', ('foo', 'orig\ncontents\nand E\n'))],
+        builder.build_snapshot([b'C-id', b'B-id'], [
+            ('modify', ('foo', b'orig\ncontents\nand E\n'))],
             revision_id=b'E-id')
         builder.finish_series()
         tree = builder.get_branch().create_checkout('tree', lightweight=True)
         self.assertEqual(1, tree.merge_from_branch(tree.branch,
-                                                   to_revision='D-id',
+                                                   to_revision=b'D-id',
                                                    merge_type=WeaveMerger))
         self.assertPathExists('tree/foo.THIS')
         self.assertPathExists('tree/foo.OTHER')
@@ -785,23 +785,23 @@
     def test_from_revision_ids(self):
         this, other = self.set_up_trees()
         self.assertRaises(errors.NoSuchRevision, Merger.from_revision_ids,
-                          this, 'rev2b')
+                          this, b'rev2b')
         this.lock_write()
         self.addCleanup(this.unlock)
         merger = Merger.from_revision_ids(this,
-            'rev2b', other_branch=other.branch)
-        self.assertEqual('rev2b', merger.other_rev_id)
-        self.assertEqual('rev1', merger.base_rev_id)
+            b'rev2b', other_branch=other.branch)
+        self.assertEqual(b'rev2b', merger.other_rev_id)
+        self.assertEqual(b'rev1', merger.base_rev_id)
         merger = Merger.from_revision_ids(this,
-            'rev2b', 'rev2a', other_branch=other.branch)
-        self.assertEqual('rev2a', merger.base_rev_id)
+            b'rev2b', b'rev2a', other_branch=other.branch)
+        self.assertEqual(b'rev2a', merger.base_rev_id)
 
     def test_from_uncommitted(self):
         this, other = self.set_up_trees()
         merger = Merger.from_uncommitted(this, other, None)
         self.assertIs(other, merger.other_tree)
         self.assertIs(None, merger.other_rev_id)
-        self.assertEqual('rev2b', merger.base_rev_id)
+        self.assertEqual(b'rev2b', merger.base_rev_id)
 
     def prepare_for_merging(self):
         this, other = self.set_up_trees()
@@ -813,25 +813,25 @@
     def test_from_mergeable(self):
         this, other = self.prepare_for_merging()
         md = merge_directive.MergeDirective2.from_objects(
-            other.branch.repository, 'rev3', 0, 0, 'this')
+            other.branch.repository, b'rev3', 0, 0, 'this')
         other.lock_read()
         self.addCleanup(other.unlock)
         merger, verified = Merger.from_mergeable(this, md)
         md.patch = None
         merger, verified = Merger.from_mergeable(this, md)
         self.assertEqual('inapplicable', verified)
-        self.assertEqual('rev3', merger.other_rev_id)
-        self.assertEqual('rev1', merger.base_rev_id)
-        md.base_revision_id = 'rev2b'
+        self.assertEqual(b'rev3', merger.other_rev_id)
+        self.assertEqual(b'rev1', merger.base_rev_id)
+        md.base_revision_id = b'rev2b'
         merger, verified = Merger.from_mergeable(this, md)
-        self.assertEqual('rev2b', merger.base_rev_id)
+        self.assertEqual(b'rev2b', merger.base_rev_id)
 
     def test_from_mergeable_old_merge_directive(self):
         this, other = self.prepare_for_merging()
         other.lock_write()
         self.addCleanup(other.unlock)
         md = merge_directive.MergeDirective.from_objects(
-            other.branch.repository, 'rev3', 0, 0, 'this')
+            other.branch.repository, b'rev3', 0, 0, 'this')
         merger, verified = Merger.from_mergeable(this, md)
-        self.assertEqual('rev3', merger.other_rev_id)
-        self.assertEqual('rev1', merger.base_rev_id)
+        self.assertEqual(b'rev3', merger.other_rev_id)
+        self.assertEqual(b'rev1', merger.base_rev_id)

=== modified file 'breezy/tests/test_reconfigure.py'
--- breezy/tests/test_reconfigure.py	2018-05-22 02:05:12 +0000
+++ breezy/tests/test_reconfigure.py	2018-06-22 01:37:16 +0000
@@ -99,10 +99,10 @@
     def test_lightweight_checkout_to_branch_tags(self):
         reconfiguration, checkout = \
             self.prepare_lightweight_checkout_to_branch()
-        checkout.branch.tags.set_tag('foo', 'bar')
+        checkout.branch.tags.set_tag('foo', b'bar')
         reconfiguration.apply()
         checkout_branch = checkout.controldir.open_branch()
-        self.assertEqual('bar', checkout_branch.tags.lookup_tag('foo'))
+        self.assertEqual(b'bar', checkout_branch.tags.lookup_tag('foo'))
 
     def prepare_lightweight_checkout_to_checkout(self):
         branch = self.make_branch('branch')
@@ -120,10 +120,10 @@
     def test_lightweight_checkout_to_checkout_tags(self):
         reconfiguration, checkout = \
             self.prepare_lightweight_checkout_to_checkout()
-        checkout.branch.tags.set_tag('foo', 'bar')
+        checkout.branch.tags.set_tag('foo', b'bar')
         reconfiguration.apply()
         checkout_branch = checkout.controldir.open_branch()
-        self.assertEqual('bar', checkout_branch.tags.lookup_tag('foo'))
+        self.assertEqual(b'bar', checkout_branch.tags.lookup_tag('foo'))
 
     def test_lightweight_conversion_uses_shared_repo(self):
         parent = self.make_branch('parent')
@@ -286,10 +286,10 @@
     def test_branch_to_lightweight_checkout_fetch_tags(self):
         parent, child, reconfiguration = \
             self.prepare_branch_to_lightweight_checkout()
-        child.branch.tags.set_tag('foo', 'bar')
+        child.branch.tags.set_tag('foo', b'bar')
         reconfiguration.apply()
         child = _mod_branch.Branch.open('child')
-        self.assertEqual('bar', parent.tags.lookup_tag('foo'))
+        self.assertEqual(b'bar', parent.tags.lookup_tag('foo'))
 
     def test_lightweight_checkout_to_lightweight_checkout(self):
         parent = self.make_branch('parent')

=== modified file 'python3.passing'
--- python3.passing	2018-06-22 01:37:16 +0000
+++ python3.passing	2018-06-22 01:37:16 +0000
@@ -75,6 +75,7 @@
 breezy.plugins.git.tests.test_memorytree.TestMemoryTree.test_last_revision
 breezy.plugins.git.tests.test_memorytree.TestMemoryTree.test_lock_tree_write
 breezy.plugins.git.tests.test_memorytree.TestMemoryTree.test_lock_tree_write_after_read_fails
+breezy.plugins.git.tests.test_memorytree.TestMemoryTree.test_lock_write
 breezy.plugins.git.tests.test_memorytree.TestMemoryTree.test_lock_write_after_read_fails
 breezy.plugins.git.tests.test_memorytree.TestMemoryTree.test_rename_file_to_subdir
 breezy.plugins.git.tests.test_object_store.DirectoryToTreeTests.test_empty
@@ -208,6 +209,7 @@
 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.upload.tests.test_upload.TestBranchUploadLocations.test_set_push_location(LocalGitBranchFormat)
+breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_set_push_location(RemoteBranchFormat-default)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_set_push_location(RemoteGitBranchFormat)
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_create_file(SFTPTransport,SFTPAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_create_file(SFTPTransport,SFTPHomeDirServer)
@@ -528,6 +530,7 @@
 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.TestBranchPushLocations.test_set_push_location(LocalGitBranchFormat)
+breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_set_push_location(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_set_push_location(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_bad_revision(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_bad_revision(BzrBranchFormat4)
@@ -583,6 +586,7 @@
 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_append_revisions_only(LocalGitBranchFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_create_append_revisions_only(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_append_revisions_only(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_append_revisions_only(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_checkout(BranchReferenceFormat)
@@ -659,6 +663,8 @@
 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_commit_builder(LocalGitBranchFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_get_commit_builder(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_branch.TestBranch.test_get_commit_builder(RemoteGitBranchFormat)
 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)
@@ -667,6 +673,7 @@
 breezy.tests.per_branch.test_branch.TestBranch.test_get_set_append_revisions_only(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestBranch.test_get_set_append_revisions_only(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_get_set_append_revisions_only(LocalGitBranchFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_get_set_append_revisions_only(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_branch.TestBranch.test_get_set_append_revisions_only(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_heads_to_fetch(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_heads_to_fetch(BzrBranchFormat4)
@@ -701,6 +708,7 @@
 breezy.tests.per_branch.test_branch.TestBranch.test_nicks_bzr(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_branch.TestBranch.test_nicks_bzr(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_nicks(LocalGitBranchFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_nicks(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_branch.TestBranch.test_nicks(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_public_branch(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_public_branch(BzrBranchFormat4)
@@ -709,6 +717,7 @@
 breezy.tests.per_branch.test_branch.TestBranch.test_public_branch(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestBranch.test_public_branch(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_public_branch(LocalGitBranchFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_public_branch(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_branch.TestBranch.test_public_branch(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_record_initial_ghost(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_record_initial_ghost(BzrBranchFormat4)
@@ -741,6 +750,7 @@
 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.TestBranch.test_submit_branch(LocalGitBranchFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_submit_branch(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_branch.TestBranch.test_submit_branch(RemoteGitBranchFormat)
 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)
@@ -758,6 +768,7 @@
 breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format_default(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format_default(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format(LocalGitBranchFormat)
+breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_branch.TestFormat.test_format_initialize_find_open(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestFormat.test_format_initialize_find_open(BzrBranchFormat4)
@@ -1127,6 +1138,7 @@
 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_submit_branch(LocalGitBranchFormat)
+breezy.tests.per_branch.test_config.TestGetConfig.test_set_submit_branch(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_config.TestGetConfig.test_set_submit_branch(RemoteGitBranchFormat)
 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)
@@ -1135,6 +1147,7 @@
 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_config.TestGetConfig.test_set_user_option_with_dict(LocalGitBranchFormat)
+breezy.tests.per_branch.test_config.TestGetConfig.test_set_user_option_with_dict(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_config.TestGetConfig.test_set_user_option_with_dict(RemoteGitBranchFormat)
 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)
@@ -1253,6 +1266,7 @@
 breezy.tests.per_branch.test_hooks.TestAllMethodsThatChangeTipWillRunHooks.test_generate_revision_history(BzrBranchFormat7)
 breezy.tests.per_branch.test_hooks.TestAllMethodsThatChangeTipWillRunHooks.test_generate_revision_history(BzrBranchFormat8)
 breezy.tests.per_branch.test_hooks.TestAllMethodsThatChangeTipWillRunHooks.test_generate_revision_history(LocalGitBranchFormat)
+breezy.tests.per_branch.test_hooks.TestAllMethodsThatChangeTipWillRunHooks.test_generate_revision_history(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_hooks.TestAllMethodsThatChangeTipWillRunHooks.test_generate_revision_history(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_hooks.TestAllMethodsThatChangeTipWillRunHooks.test_pull(BranchReferenceFormat)
 breezy.tests.per_branch.test_hooks.TestAllMethodsThatChangeTipWillRunHooks.test_pull(BzrBranchFormat4)
@@ -1277,6 +1291,7 @@
 breezy.tests.per_branch.test_hooks.TestAllMethodsThatChangeTipWillRunHooks.test_set_last_revision_info(BzrBranchFormat7)
 breezy.tests.per_branch.test_hooks.TestAllMethodsThatChangeTipWillRunHooks.test_set_last_revision_info(BzrBranchFormat8)
 breezy.tests.per_branch.test_hooks.TestAllMethodsThatChangeTipWillRunHooks.test_set_last_revision_info(LocalGitBranchFormat)
+breezy.tests.per_branch.test_hooks.TestAllMethodsThatChangeTipWillRunHooks.test_set_last_revision_info(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_hooks.TestAllMethodsThatChangeTipWillRunHooks.test_set_last_revision_info(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_hooks.TestOpen.test_create(BranchReferenceFormat)
 breezy.tests.per_branch.test_hooks.TestOpen.test_create(BzrBranchFormat4)
@@ -1305,6 +1320,7 @@
 breezy.tests.per_branch.test_hooks.TestPostChangeBranchTip.test_branch_is_locked(BzrBranchFormat7)
 breezy.tests.per_branch.test_hooks.TestPostChangeBranchTip.test_branch_is_locked(BzrBranchFormat8)
 breezy.tests.per_branch.test_hooks.TestPostChangeBranchTip.test_branch_is_locked(LocalGitBranchFormat)
+breezy.tests.per_branch.test_hooks.TestPostChangeBranchTip.test_branch_is_locked(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_hooks.TestPostChangeBranchTip.test_branch_is_locked(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_hooks.TestPostChangeBranchTip.test_calls_all_hooks_no_errors(BranchReferenceFormat)
 breezy.tests.per_branch.test_hooks.TestPostChangeBranchTip.test_calls_all_hooks_no_errors(BzrBranchFormat4)
@@ -1313,6 +1329,7 @@
 breezy.tests.per_branch.test_hooks.TestPostChangeBranchTip.test_calls_all_hooks_no_errors(BzrBranchFormat7)
 breezy.tests.per_branch.test_hooks.TestPostChangeBranchTip.test_calls_all_hooks_no_errors(BzrBranchFormat8)
 breezy.tests.per_branch.test_hooks.TestPostChangeBranchTip.test_calls_all_hooks_no_errors(LocalGitBranchFormat)
+breezy.tests.per_branch.test_hooks.TestPostChangeBranchTip.test_calls_all_hooks_no_errors(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_hooks.TestPostChangeBranchTip.test_calls_all_hooks_no_errors(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_hooks.TestPostChangeBranchTip.test_empty_history(BranchReferenceFormat)
 breezy.tests.per_branch.test_hooks.TestPostChangeBranchTip.test_empty_history(BzrBranchFormat4)
@@ -1321,6 +1338,7 @@
 breezy.tests.per_branch.test_hooks.TestPostChangeBranchTip.test_empty_history(BzrBranchFormat7)
 breezy.tests.per_branch.test_hooks.TestPostChangeBranchTip.test_empty_history(BzrBranchFormat8)
 breezy.tests.per_branch.test_hooks.TestPostChangeBranchTip.test_empty_history(LocalGitBranchFormat)
+breezy.tests.per_branch.test_hooks.TestPostChangeBranchTip.test_empty_history(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_hooks.TestPostChangeBranchTip.test_empty_history(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_hooks.TestPostChangeBranchTip.test_hook_runs_after_change(BranchReferenceFormat)
 breezy.tests.per_branch.test_hooks.TestPostChangeBranchTip.test_hook_runs_after_change(BzrBranchFormat4)
@@ -1345,6 +1363,7 @@
 breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_branch_is_locked(BzrBranchFormat7)
 breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_branch_is_locked(BzrBranchFormat8)
 breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_branch_is_locked(LocalGitBranchFormat)
+breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_branch_is_locked(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_branch_is_locked(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_calls_all_hooks_no_errors(BranchReferenceFormat)
 breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_calls_all_hooks_no_errors(BzrBranchFormat4)
@@ -1353,6 +1372,7 @@
 breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_calls_all_hooks_no_errors(BzrBranchFormat7)
 breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_calls_all_hooks_no_errors(BzrBranchFormat8)
 breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_calls_all_hooks_no_errors(LocalGitBranchFormat)
+breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_calls_all_hooks_no_errors(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_calls_all_hooks_no_errors(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_empty_history(BranchReferenceFormat)
 breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_empty_history(BzrBranchFormat4)
@@ -1361,6 +1381,7 @@
 breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_empty_history(BzrBranchFormat7)
 breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_empty_history(BzrBranchFormat8)
 breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_empty_history(LocalGitBranchFormat)
+breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_empty_history(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_empty_history(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_explicit_reject_by_hook(BranchReferenceFormat)
 breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_explicit_reject_by_hook(BzrBranchFormat4)
@@ -1647,6 +1668,8 @@
 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_dont_leave_lock_in_place(LocalGitBranchFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_dont_leave_lock_in_place(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_dont_leave_lock_in_place(RemoteGitBranchFormat)
 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)
@@ -1654,6 +1677,8 @@
 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_leave_lock_in_place(LocalGitBranchFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_leave_lock_in_place(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_leave_lock_in_place(RemoteGitBranchFormat)
 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)
@@ -1661,6 +1686,8 @@
 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_and_unlock_leaves_repo_unlocked(LocalGitBranchFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_and_unlock_leaves_repo_unlocked(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_and_unlock_leaves_repo_unlocked(RemoteGitBranchFormat)
 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)
@@ -1698,6 +1725,8 @@
 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_locks_repo_too(LocalGitBranchFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_locks_repo_too(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_locks_repo_too(RemoteGitBranchFormat)
 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)
@@ -1715,6 +1744,8 @@
 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_reenter_with_token(LocalGitBranchFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_reenter_with_token(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_reenter_with_token(RemoteGitBranchFormat)
 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)
@@ -1722,6 +1753,8 @@
 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_None_refuses_token(LocalGitBranchFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_None_refuses_token(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_None_refuses_token(RemoteGitBranchFormat)
 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)
@@ -1729,6 +1762,8 @@
 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_returns_unlockable(LocalGitBranchFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_unlockable(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_unlockable(RemoteGitBranchFormat)
 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)
@@ -1736,6 +1771,8 @@
 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_matching_token(LocalGitBranchFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_matching_token(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_matching_token(RemoteGitBranchFormat)
 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)
@@ -1743,6 +1780,7 @@
 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_nonmatching_token(LocalGitBranchFormat)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_nonmatching_token(RemoteGitBranchFormat)
 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)
@@ -1750,6 +1788,8 @@
 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_lock_write_with_token_fails_when_unlocked(LocalGitBranchFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_token_fails_when_unlocked(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_token_fails_when_unlocked(RemoteGitBranchFormat)
 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)
@@ -1757,6 +1797,7 @@
 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_reentering_lock_write_raises_on_token_mismatch(LocalGitBranchFormat)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_reentering_lock_write_raises_on_token_mismatch(RemoteGitBranchFormat)
 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)
@@ -1764,6 +1805,8 @@
 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)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_unlock_after_lock_write_with_token(BzrBranchFormat8)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_unlock_after_lock_write_with_token(LocalGitBranchFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_unlock_after_lock_write_with_token(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_unlock_after_lock_write_with_token(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_parent.TestParent.test_get_invalid_parent(BranchReferenceFormat)
 breezy.tests.per_branch.test_parent.TestParent.test_get_invalid_parent(BzrBranchFormat4)
@@ -1828,6 +1871,7 @@
 breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_bound_branch(BzrBranchFormat6)
 breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_bound_branch(BzrBranchFormat7)
 breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_bound_branch(BzrBranchFormat8)
+breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_bound_branch(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_bound_branch(RemoteGitBranchFormat)
 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)
@@ -1835,6 +1879,7 @@
 breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_empty_history(BzrBranchFormat6)
 breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_empty_history(BzrBranchFormat7)
 breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_empty_history(BzrBranchFormat8)
+breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_empty_history(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_empty_history(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_nonempty_history(BranchReferenceFormat)
 breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_nonempty_history(BzrBranchFormat5)
@@ -1893,12 +1938,20 @@
 breezy.tests.per_branch.test_pull.TestPull.test_pull_updates_checkout_and_master(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_push.EmptyPushSmartEffortTests.test_empty_branch_api(BranchReferenceFormat)
 breezy.tests.per_branch.test_push.EmptyPushSmartEffortTests.test_empty_branch_api(BzrBranchFormat4)
+breezy.tests.per_branch.test_push.EmptyPushSmartEffortTests.test_empty_branch_api(BzrBranchFormat5)
+breezy.tests.per_branch.test_push.EmptyPushSmartEffortTests.test_empty_branch_api(BzrBranchFormat6)
+breezy.tests.per_branch.test_push.EmptyPushSmartEffortTests.test_empty_branch_api(BzrBranchFormat7)
+breezy.tests.per_branch.test_push.EmptyPushSmartEffortTests.test_empty_branch_api(BzrBranchFormat8)
 breezy.tests.per_branch.test_push.EmptyPushSmartEffortTests.test_empty_branch_api(LocalGitBranchFormat)
 breezy.tests.per_branch.test_push.EmptyPushSmartEffortTests.test_empty_branch_api(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_push.EmptyPushSmartEffortTests.test_empty_branch_api(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_push.EmptyPushSmartEffortTests.test_empty_branch_api(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_push.EmptyPushSmartEffortTests.test_empty_branch_command(BranchReferenceFormat)
 breezy.tests.per_branch.test_push.EmptyPushSmartEffortTests.test_empty_branch_command(BzrBranchFormat4)
+breezy.tests.per_branch.test_push.EmptyPushSmartEffortTests.test_empty_branch_command(BzrBranchFormat5)
+breezy.tests.per_branch.test_push.EmptyPushSmartEffortTests.test_empty_branch_command(BzrBranchFormat6)
+breezy.tests.per_branch.test_push.EmptyPushSmartEffortTests.test_empty_branch_command(BzrBranchFormat7)
+breezy.tests.per_branch.test_push.EmptyPushSmartEffortTests.test_empty_branch_command(BzrBranchFormat8)
 breezy.tests.per_branch.test_push.EmptyPushSmartEffortTests.test_empty_branch_command(LocalGitBranchFormat)
 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)
@@ -1918,6 +1971,7 @@
 breezy.tests.per_branch.test_push.TestPushHook.test_post_push_bound_branch(BzrBranchFormat6)
 breezy.tests.per_branch.test_push.TestPushHook.test_post_push_bound_branch(BzrBranchFormat7)
 breezy.tests.per_branch.test_push.TestPushHook.test_post_push_bound_branch(BzrBranchFormat8)
+breezy.tests.per_branch.test_push.TestPushHook.test_post_push_bound_branch(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_push.TestPushHook.test_post_push_bound_branch(RemoteGitBranchFormat)
 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)
@@ -1925,6 +1979,7 @@
 breezy.tests.per_branch.test_push.TestPushHook.test_post_push_empty_history(BzrBranchFormat6)
 breezy.tests.per_branch.test_push.TestPushHook.test_post_push_empty_history(BzrBranchFormat7)
 breezy.tests.per_branch.test_push.TestPushHook.test_post_push_empty_history(BzrBranchFormat8)
+breezy.tests.per_branch.test_push.TestPushHook.test_post_push_empty_history(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_push.TestPushHook.test_post_push_empty_history(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_push.TestPushHook.test_post_push_nonempty_history(BranchReferenceFormat)
 breezy.tests.per_branch.test_push.TestPushHook.test_post_push_nonempty_history(BzrBranchFormat5)
@@ -1946,6 +2001,9 @@
 breezy.tests.per_branch.test_push.TestPush.test_push_merged_indirect(RemoteGitBranchFormat)
 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_new_tag_to_bound_branch(BzrBranchFormat6)
+breezy.tests.per_branch.test_push.TestPush.test_push_new_tag_to_bound_branch(BzrBranchFormat7)
+breezy.tests.per_branch.test_push.TestPush.test_push_new_tag_to_bound_branch(BzrBranchFormat8)
 breezy.tests.per_branch.test_push.TestPush.test_push_new_tag_to_bound_branch(LocalGitBranchFormat)
 breezy.tests.per_branch.test_push.TestPush.test_push_new_tag_to_bound_branch(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_push.TestPush.test_push_new_tag_to_bound_branch(RemoteBranchFormat-v2)
@@ -2003,6 +2061,7 @@
 breezy.tests.per_branch.test_push.TestPush.test_push_within_repository(BzrBranchFormat7)
 breezy.tests.per_branch.test_push.TestPush.test_push_within_repository(BzrBranchFormat8)
 breezy.tests.per_branch.test_push.TestPush.test_push_within_repository(LocalGitBranchFormat)
+breezy.tests.per_branch.test_push.TestPush.test_push_within_repository(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_push.TestPush.test_push_within_repository(RemoteGitBranchFormat)
 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)
@@ -2025,6 +2084,8 @@
 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_returns_reconciler(LocalGitBranchFormat)
+breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_returns_reconciler(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_returns_reconciler(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_supports_thorough(BranchReferenceFormat)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_supports_thorough(BzrBranchFormat4)
@@ -2032,6 +2093,8 @@
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_supports_thorough(BzrBranchFormat6)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_supports_thorough(BzrBranchFormat7)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_supports_thorough(BzrBranchFormat8)
+breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_supports_thorough(LocalGitBranchFormat)
+breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_supports_thorough(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_supports_thorough(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_revision_id_to_dotted_revno.TestRevisionIdToDottedRevno.test_lookup_dotted_revno(BranchReferenceFormat)
 breezy.tests.per_branch.test_revision_id_to_dotted_revno.TestRevisionIdToDottedRevno.test_lookup_dotted_revno(BzrBranchFormat5)
@@ -2097,9 +2160,14 @@
 breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_uses_bzrdir_branch_format(BzrBranchFormat6)
 breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_uses_bzrdir_branch_format(BzrBranchFormat7)
 breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_uses_bzrdir_branch_format(BzrBranchFormat8)
+breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_uses_bzrdir_branch_format(LocalGitBranchFormat)
 breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_uses_bzrdir_branch_format(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_with_ghost_in_mainline(BranchReferenceFormat)
 breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_with_ghost_in_mainline(BzrBranchFormat4)
+breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_with_ghost_in_mainline(BzrBranchFormat5)
+breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_with_ghost_in_mainline(BzrBranchFormat6)
+breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_with_ghost_in_mainline(BzrBranchFormat7)
+breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_with_ghost_in_mainline(BzrBranchFormat8)
 breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_with_ghost_in_mainline(LocalGitBranchFormat)
 breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_with_ghost_in_mainline(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_with_ghost_in_mainline(RemoteGitBranchFormat)
@@ -2269,6 +2337,7 @@
 breezy.tests.per_branch.test_stacking.TestStacking.test_transform_fallback_location_hook(BzrBranchFormat7)
 breezy.tests.per_branch.test_stacking.TestStacking.test_transform_fallback_location_hook(BzrBranchFormat8)
 breezy.tests.per_branch.test_stacking.TestStacking.test_transform_fallback_location_hook(LocalGitBranchFormat)
+breezy.tests.per_branch.test_stacking.TestStacking.test_transform_fallback_location_hook(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_stacking.TestStacking.test_transform_fallback_location_hook(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_stacking.TestStacking.test_unstack_already_locked(BranchReferenceFormat)
 breezy.tests.per_branch.test_stacking.TestStacking.test_unstack_already_locked(BzrBranchFormat4)
@@ -2343,6 +2412,10 @@
 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_ghost_tag(BzrBranchFormat6)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_ghost_tag(BzrBranchFormat7)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_ghost_tag(BzrBranchFormat8)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_ghost_tag(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_ghost_tag(RemoteGitBranchFormat)
 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)
@@ -2669,6 +2742,7 @@
 breezy.tests.per_interbranch.test_pull.TestPull.test_pull_raises_specific_error_on_master_connection_error(GenericInterBranch,BzrBranchFormat7,BzrBranchFormat7)
 breezy.tests.per_interbranch.test_pull.TestPull.test_pull_raises_specific_error_on_master_connection_error(InterFromGitBranch,RemoteGitBranchFormat,BzrBranchFormat7)
 breezy.tests.per_interbranch.test_pull.TestPull.test_pull_raises_specific_error_on_master_connection_error(InterGitLocalGitBranch,RemoteGitBranchFormat,LocalGitBranchFormat)
+breezy.tests.per_interbranch.test_pull.TestPull.test_pull_raises_specific_error_on_master_connection_error(InterToGitBranch,BzrBranchFormat7,LocalGitBranchFormat)
 breezy.tests.per_interbranch.test_pull.TestPull.test_pull_raises_specific_error_on_master_connection_error(InterToGitBranch,BzrBranchFormat7,RemoteGitBranchFormat)
 breezy.tests.per_interbranch.test_pull.TestPull.test_pull_returns_result(GenericInterBranch,BzrBranchFormat7,BzrBranchFormat7)
 breezy.tests.per_interbranch.test_pull.TestPull.test_pull_returns_result(InterFromGitBranch,RemoteGitBranchFormat,BzrBranchFormat7)
@@ -2682,6 +2756,7 @@
 breezy.tests.per_interbranch.test_push.TestPushHook.test_post_push_bound_branch(InterFromGitBranch,RemoteGitBranchFormat,BzrBranchFormat7)
 breezy.tests.per_interbranch.test_push.TestPushHook.test_post_push_bound_branch(InterGitLocalGitBranch,RemoteGitBranchFormat,LocalGitBranchFormat)
 breezy.tests.per_interbranch.test_push.TestPushHook.test_post_push_bound_branch(InterLocalGitRemoteGitBranch,LocalGitBranchFormat,RemoteGitBranchFormat)
+breezy.tests.per_interbranch.test_push.TestPushHook.test_post_push_bound_branch(InterToGitBranch,BzrBranchFormat7,LocalGitBranchFormat)
 breezy.tests.per_interbranch.test_push.TestPushHook.test_post_push_bound_branch(InterToGitBranch,BzrBranchFormat7,RemoteGitBranchFormat)
 breezy.tests.per_interbranch.test_push.TestPushHook.test_post_push_empty_history(GenericInterBranch,BzrBranchFormat7,BzrBranchFormat7)
 breezy.tests.per_interbranch.test_push.TestPushHook.test_post_push_empty_history(InterFromGitBranch,RemoteGitBranchFormat,BzrBranchFormat7)
@@ -2709,6 +2784,7 @@
 breezy.tests.per_interbranch.test_push.TestPush.test_push_overwrite_of_non_tip_with_stop_revision(InterLocalGitRemoteGitBranch,LocalGitBranchFormat,RemoteGitBranchFormat)
 breezy.tests.per_interbranch.test_push.TestPush.test_push_overwrite_of_non_tip_with_stop_revision(InterToGitBranch,BzrBranchFormat7,RemoteGitBranchFormat)
 breezy.tests.per_interbranch.test_push.TestPush.test_push_raises_specific_error_on_master_connection_error(GenericInterBranch,BzrBranchFormat7,BzrBranchFormat7)
+breezy.tests.per_interbranch.test_push.TestPush.test_push_raises_specific_error_on_master_connection_error(InterFromGitBranch,LocalGitBranchFormat,BzrBranchFormat7)
 breezy.tests.per_interbranch.test_push.TestPush.test_push_raises_specific_error_on_master_connection_error(InterFromGitBranch,RemoteGitBranchFormat,BzrBranchFormat7)
 breezy.tests.per_interbranch.test_push.TestPush.test_push_raises_specific_error_on_master_connection_error(InterGitLocalGitBranch,LocalGitBranchFormat,LocalGitBranchFormat)
 breezy.tests.per_interbranch.test_push.TestPush.test_push_raises_specific_error_on_master_connection_error(InterGitLocalGitBranch,RemoteGitBranchFormat,LocalGitBranchFormat)
@@ -3092,6 +3168,7 @@
 breezy.tests.per_lock.test_temporary_write_lock.TestTemporaryWriteLock.test_fails_when_locked(fcntl)
 breezy.tests.per_lock.test_temporary_write_lock.TestTemporaryWriteLock.test_is_write_locked(fcntl)
 breezy.tests.per_merger.TestMergeImplementation.test_merge_move_and_change(diff3)
+breezy.tests.per_merger.TestMergeImplementation.test_merge_move_and_change(merge3)
 breezy.tests.per_merger.TestMergeImplementation.test_merge_with_existing_limbo_empty(diff3)
 breezy.tests.per_merger.TestMergeImplementation.test_merge_with_existing_limbo_empty(lca)
 breezy.tests.per_merger.TestMergeImplementation.test_merge_with_existing_limbo_empty(merge3)
@@ -3109,6 +3186,7 @@
 breezy.tests.per_merger.TestMergeImplementation.test_merge_with_pending_deletion_non_empty(merge3)
 breezy.tests.per_merger.TestMergeImplementation.test_merge_with_pending_deletion_non_empty(weave)
 breezy.tests.per_merger.TestMergeImplementation.test_modify_conflicts_with_delete(diff3)
+breezy.tests.per_merger.TestMergeImplementation.test_modify_conflicts_with_delete(merge3)
 breezy.tests.permute_tests_for_extension.<locals>.FailWithoutFeature.test_fail
 breezy.tests.per_pack_repository.TestPackRepositoryStacking.test_adding_pack_does_not_record_pack_names_from_other_repositories(2a)
 breezy.tests.per_pack_repository.TestPackRepositoryStacking.test_adding_pack_does_not_record_pack_names_from_other_repositories(pack-0.92)
@@ -3447,6 +3525,7 @@
 breezy.tests.per_repository.test_break_lock.TestBreakLock.test_unlocked(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_break_lock.TestBreakLock.test_unlocked(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_check.TestCleanRepository.test_new_repo(RepositoryFormat4)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_abort_record_iter_changes(RemoteRepositoryFormat-default)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_abort_record_iter_changes(RepositoryFormat2a)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_abort_record_iter_changes(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_abort_record_iter_changes(RepositoryFormat4)
@@ -3489,6 +3568,7 @@
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_message(RepositoryFormat5)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_message(RepositoryFormat6)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_message(RepositoryFormat7)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_committer_no_username(RemoteRepositoryFormat-default)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_committer_no_username(RepositoryFormat2a)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_committer_no_username(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_committer_no_username(RepositoryFormat4)
@@ -3504,6 +3584,8 @@
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_unchanged_root_record_iter_changes(RepositoryFormat5)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_unchanged_root_record_iter_changes(RepositoryFormat6)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_unchanged_root_record_iter_changes(RepositoryFormat7)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_without_root_errors(GitRepositoryFormat)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_without_root_errors(RemoteRepositoryFormat-default)
 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)
@@ -3522,9 +3604,11 @@
 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)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_with_revision_id_record_iter_changes(GitRepositoryFormat)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_with_revision_id_record_iter_changes(RepositoryFormat2a)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_with_revision_id_record_iter_changes(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_commit_with_revision_id_record_iter_changes(RepositoryFormat4)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_finish_inventory_record_iter_changes(RemoteRepositoryFormat-default)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_finish_inventory_record_iter_changes(RepositoryFormat2a)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_finish_inventory_record_iter_changes(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_finish_inventory_record_iter_changes(RepositoryFormat4)
@@ -5465,6 +5549,7 @@
 breezy.tests.per_repository.test_revision.TestRevisionAttributes.test_zero_timezone(RepositoryFormat6)
 breezy.tests.per_repository.test_revision.TestRevisionAttributes.test_zero_timezone(RepositoryFormat7)
 breezy.tests.per_repository.test_revision.TestRevProps.test_invalid_revprops(GitRepositoryFormat)
+breezy.tests.per_repository.test_revision.TestRevProps.test_invalid_revprops(RemoteRepositoryFormat-default)
 breezy.tests.per_repository.test_revision.TestRevProps.test_invalid_revprops(RepositoryFormat2a)
 breezy.tests.per_repository.test_revision.TestRevProps.test_invalid_revprops(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_revision.TestRevProps.test_invalid_revprops(RepositoryFormat4)
@@ -6389,6 +6474,9 @@
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking(RepositoryFormatKnit1)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking(RepositoryFormatKnit3)
 breezy.tests.per_repository_vf.test_write_group.TestGetMissingParentInventories.test_insert_stream_without_locking(RepositoryFormatKnit4)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_add_missing_parent_after_resume(RemoteRepositoryFormat-v2)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_add_missing_parent_after_resume(RepositoryFormat2a)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_add_missing_parent_after_resume(RepositoryFormat2aSubtree)
 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)
@@ -6396,6 +6484,9 @@
 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(RemoteRepositoryFormat-v2)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_cannot_resume_aborted_write_group(RepositoryFormat2a)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_cannot_resume_aborted_write_group(RepositoryFormat2aSubtree)
 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)
@@ -6403,6 +6494,9 @@
 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(RemoteRepositoryFormat-v2)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_adding_missing_parents(RepositoryFormat2a)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_adding_missing_parents(RepositoryFormat2aSubtree)
 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)
@@ -6424,6 +6518,10 @@
 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(RemoteRepositoryFormat-default)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_with_missing_parents(RemoteRepositoryFormat-v2)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_with_missing_parents(RepositoryFormat2a)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_commit_resumed_write_group_with_missing_parents(RepositoryFormat2aSubtree)
 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)
@@ -6431,6 +6529,9 @@
 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(RemoteRepositoryFormat-v2)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_multiple_resume_write_group(RepositoryFormat2a)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_multiple_resume_write_group(RepositoryFormat2aSubtree)
 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)
@@ -6438,6 +6539,9 @@
 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(RemoteRepositoryFormat-v2)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_no_op_suspend_resume(RepositoryFormat2a)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_no_op_suspend_resume(RepositoryFormat2aSubtree)
 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)
@@ -6445,6 +6549,9 @@
 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(RemoteRepositoryFormat-v2)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_resume_abort_fails(RepositoryFormat2a)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_resume_abort_fails(RepositoryFormat2aSubtree)
 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)
@@ -6452,6 +6559,9 @@
 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(RemoteRepositoryFormat-v2)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_second_suspend_fails(RepositoryFormat2a)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_second_suspend_fails(RepositoryFormat2aSubtree)
 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)
@@ -6459,6 +6569,10 @@
 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(RemoteRepositoryFormat-default)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_suspend_fails(RemoteRepositoryFormat-v2)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_suspend_fails(RepositoryFormat2a)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_read_after_suspend_fails(RepositoryFormat2aSubtree)
 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)
@@ -6486,7 +6600,16 @@
 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)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_write_group_then_abort(RemoteRepositoryFormat-v2)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_write_group_then_abort(RepositoryFormat2a)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_write_group_then_abort(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_write_group_then_abort(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_write_group_then_abort(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_write_group_then_abort(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_write_group_then_abort(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_write_group_then_abort(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_write_group_then_abort(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_resume_write_group_then_abort(RepositoryFormatKnit4)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_empty_initial_write_group(RemoteRepositoryFormat-default)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_empty_initial_write_group(RemoteRepositoryFormat-v2)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_empty_initial_write_group(RepositoryFormat2a)
@@ -6507,7 +6630,17 @@
 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)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_write_group(RemoteRepositoryFormat-default)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_write_group(RemoteRepositoryFormat-v2)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_write_group(RepositoryFormat2a)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_write_group(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_write_group(RepositoryFormat4)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_write_group(RepositoryFormat5)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_write_group(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_write_group(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_write_group(RepositoryFormatKnit1)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_write_group(RepositoryFormatKnit3)
+breezy.tests.per_repository_vf.test_write_group.TestResumeableWriteGroup.test_suspend_write_group(RepositoryFormatKnit4)
 breezy.tests.per_transport.TransportTests.test_abspath_at_root(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_abspath_at_root(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_abspath_at_root(FakeVFATTransportDecorator,FakeVFATServer)
@@ -8017,7 +8150,18 @@
 breezy.tests.per_tree.test_get_root_id.TestGetRootID.test_get_root_id_default(WorkingTreeFormat5)
 breezy.tests.per_tree.test_get_root_id.TestGetRootID.test_get_root_id_default(WorkingTreeFormat6)
 breezy.tests.per_tree.test_get_root_id.TestGetRootID.test_get_root_id_default(WorkingTreeFormat6,remote)
+breezy.tests.per_tree.test_get_root_id.TestGetRootID.test_get_root_id_fixed(DirStateRevisionTree,WT4)
+breezy.tests.per_tree.test_get_root_id.TestGetRootID.test_get_root_id_fixed(DirStateRevisionTree,WT5)
 breezy.tests.per_tree.test_get_root_id.TestGetRootID.test_get_root_id_fixed(GitWorkingTreeFormat)
+breezy.tests.per_tree.test_get_root_id.TestGetRootID.test_get_root_id_fixed(PreviewTree)
+breezy.tests.per_tree.test_get_root_id.TestGetRootID.test_get_root_id_fixed(PreviewTreePost)
+breezy.tests.per_tree.test_get_root_id.TestGetRootID.test_get_root_id_fixed(RevisionTree)
+breezy.tests.per_tree.test_get_root_id.TestGetRootID.test_get_root_id_fixed(WorkingTreeFormat2)
+breezy.tests.per_tree.test_get_root_id.TestGetRootID.test_get_root_id_fixed(WorkingTreeFormat3)
+breezy.tests.per_tree.test_get_root_id.TestGetRootID.test_get_root_id_fixed(WorkingTreeFormat4)
+breezy.tests.per_tree.test_get_root_id.TestGetRootID.test_get_root_id_fixed(WorkingTreeFormat5)
+breezy.tests.per_tree.test_get_root_id.TestGetRootID.test_get_root_id_fixed(WorkingTreeFormat6)
+breezy.tests.per_tree.test_get_root_id.TestGetRootID.test_get_root_id_fixed(WorkingTreeFormat6,remote)
 breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_symlink_target(DirStateRevisionTree,WT4)
 breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_symlink_target(DirStateRevisionTree,WT5)
 breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_symlink_target(PreviewTree)
@@ -8028,6 +8172,17 @@
 breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_symlink_target(WorkingTreeFormat5)
 breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_symlink_target(WorkingTreeFormat6)
 breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_symlink_target(WorkingTreeFormat6,remote)
+breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_unicode_symlink_target(DirStateRevisionTree,WT4)
+breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_unicode_symlink_target(DirStateRevisionTree,WT5)
+breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_unicode_symlink_target(PreviewTree)
+breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_unicode_symlink_target(PreviewTreePost)
+breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_unicode_symlink_target(RevisionTree)
+breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_unicode_symlink_target(WorkingTreeFormat2)
+breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_unicode_symlink_target(WorkingTreeFormat3)
+breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_unicode_symlink_target(WorkingTreeFormat4)
+breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_unicode_symlink_target(WorkingTreeFormat5)
+breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_unicode_symlink_target(WorkingTreeFormat6)
+breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_unicode_symlink_target(WorkingTreeFormat6,remote)
 breezy.tests.per_tree.test_ids.IdTests.test_id2path(GitWorkingTreeFormat)
 breezy.tests.per_tree.test_ids.IdTests.test_id2path(WorkingTreeFormat2)
 breezy.tests.per_tree.test_ids.IdTests.test_id2path(WorkingTreeFormat3)
@@ -8165,6 +8320,13 @@
 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_tree_content_summary(WorkingTreeFormat6,remote)
+breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_unicode_symlink_content_summary(RevisionTree)
+breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_unicode_symlink_content_summary(WorkingTreeFormat2)
+breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_unicode_symlink_content_summary(WorkingTreeFormat3)
+breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_unicode_symlink_content_summary(WorkingTreeFormat4)
+breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_unicode_symlink_content_summary(WorkingTreeFormat5)
+breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_unicode_symlink_content_summary(WorkingTreeFormat6)
+breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_unicode_symlink_content_summary(WorkingTreeFormat6,remote)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_unicode_symlink_target_summary(RevisionTree)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_unicode_symlink_target_summary(WorkingTreeFormat2)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_unicode_symlink_target_summary(WorkingTreeFormat3)
@@ -8335,6 +8497,7 @@
 breezy.tests.per_tree.test_tree.TestReference.test_get_reference_revision(WorkingTreeFormat4)
 breezy.tests.per_tree.test_tree.TestReference.test_get_reference_revision(WorkingTreeFormat5)
 breezy.tests.per_tree.test_tree.TestReference.test_get_reference_revision(WorkingTreeFormat6)
+breezy.tests.per_tree.test_tree.TestReference.test_get_reference_revision(WorkingTreeFormat6,remote)
 breezy.tests.per_tree.test_tree.TestReference.test_get_root_id(GitWorkingTreeFormat)
 breezy.tests.per_tree.test_tree.TestReference.test_is_versioned(DirStateRevisionTree,WT4)
 breezy.tests.per_tree.test_tree.TestReference.test_is_versioned(DirStateRevisionTree,WT5)
@@ -8355,6 +8518,7 @@
 breezy.tests.per_tree.test_tree.TestReference.test_iter_references(WorkingTreeFormat4)
 breezy.tests.per_tree.test_tree.TestReference.test_iter_references(WorkingTreeFormat5)
 breezy.tests.per_tree.test_tree.TestReference.test_iter_references(WorkingTreeFormat6)
+breezy.tests.per_tree.test_tree.TestReference.test_iter_references(WorkingTreeFormat6,remote)
 breezy.tests.per_tree.test_tree.TestStoredKind.test_stored_kind(WorkingTreeFormat2)
 breezy.tests.per_tree.test_tree.TestStoredKind.test_stored_kind(WorkingTreeFormat3)
 breezy.tests.per_tree.test_tree.TestSupportsRenameTracking.test_supports_rename_tracking(DirStateRevisionTree,WT4)
@@ -8849,6 +9013,7 @@
 breezy.tests.per_workingtree.test_add.TestAdd.test_add_previously_added(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_add.TestAdd.test_add_previously_added(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_add.TestAdd.test_add_previously_added(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_add.TestAdd.test_add_root(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_add.TestAdd.test_add_root(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_add.TestAdd.test_add_root(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_add.TestAdd.test_add_root(WorkingTreeFormat4)
@@ -8887,6 +9052,7 @@
 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_locked(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_break_lock.TestBreakLock.test_unlocked_repo_locked(WorkingTreeFormat2)
 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)
@@ -8965,6 +9131,7 @@
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_aborted_does_not_apply_automatic_changes_bug_282402(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_aborted_does_not_apply_automatic_changes_bug_282402(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_aborted_does_not_apply_automatic_changes_bug_282402(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_aborted_does_not_apply_automatic_changes_bug_282402(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_deleted_subtree_and_files_updates_workingtree(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_deleted_subtree_and_files_updates_workingtree(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_deleted_subtree_with_removed(WorkingTreeFormat2)
@@ -8985,11 +9152,13 @@
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_exclude_pending_merge_fails(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_exclude_subtree_of_selected(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_exclude_subtree_of_selected(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_local_unbound(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_local_unbound(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_local_unbound(WorkingTreeFormat3)
 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_commit_local_unbound(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_merged_kind_change(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_move_new(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_returns_revision_id(WorkingTreeFormat2)
@@ -9162,16 +9331,60 @@
 breezy.tests.per_workingtree.test_eol_conversion.TestEolConversion.test_eol_no_rules_dirty(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_eol_conversion.TestEolConversion.test_eol_no_rules_dirty(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_eol_conversion.TestEolConversion.test_eol_no_rules_dirty(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_01_is_executable(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_01_is_executable(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_01_is_executable(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_01_is_executable(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_01_is_executable(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_01_is_executable(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_02_stays_executable(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_02_stays_executable(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_02_stays_executable(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_02_stays_executable(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_02_stays_executable(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_02_stays_executable(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_03_after_commit(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_03_after_commit(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_03_after_commit(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_03_after_commit(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_03_after_commit(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_04_after_removed(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_04_after_removed(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_05_removed_and_committed(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_05_removed_and_committed(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_05_removed_and_committed(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_05_removed_and_committed(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_05_removed_and_committed(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_06_branch(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_06_branch(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_06_branch(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_06_branch(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_07_pull(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_08_no_op_revert(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_08_no_op_revert(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_08_no_op_revert(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_08_no_op_revert(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_08_no_op_revert(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_commit_with_exec_from_basis(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_commit_with_exec_from_basis(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_commit_with_exec_from_basis(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_commit_with_exec_from_basis(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_commit_with_exec_from_basis(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_use_exec_from_basis(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_use_exec_from_basis(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_flush.TestFlush.test_flush_fresh_tree(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_flush.TestFlush.test_flush_fresh_tree(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_flush.TestFlush.test_flush_fresh_tree(WorkingTreeFormat3)
 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_fresh_tree(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_flush.TestFlush.test_flush_when_inventory_is_modified(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_flush.TestFlush.test_flush_when_inventory_is_modified(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_flush.TestFlush.test_flush_when_inventory_is_modified(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_flush.TestFlush.test_flush_when_inventory_is_modified(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_flush.TestFlush.test_flush_when_inventory_is_modified(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_flush.TestFlush.test_flush_when_inventory_is_modified(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_flush.TestFlush.test_flush_with_no_lock_fails(GitWorkingTreeFormat)
 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)
@@ -9214,6 +9427,7 @@
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_add(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_add(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_add(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_add(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_child_rename_ordering(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_child_rename_ordering(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_child_rename_ordering(WorkingTreeFormat3)
@@ -9227,6 +9441,7 @@
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_remove(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_remove(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_remove(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_remove(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_dir_with_children(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_dir_with_children_with_children(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_dir_with_children_with_children(WorkingTreeFormat2)
@@ -9234,23 +9449,27 @@
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_dir_with_children_with_children(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_dir_with_children_with_children(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_dir_with_children_with_children(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_dir_with_children_with_children(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_dir_with_children(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_dir_with_children(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_dir_with_children(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_dir_with_children(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_dir_with_children(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_dir_with_children(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_file(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_file(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_file(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_file(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_file(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_file(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_file(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_swap(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_swap(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_swap(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_swap(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_swap(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_swap(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_swap(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_replace_root(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_inv.TestRevert.test_dangling_id(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_inv.TestRevert.test_dangling_id(WorkingTreeFormat3)
@@ -9297,21 +9516,27 @@
 breezy.tests.per_workingtree.test_is_ignored.TestIsIgnored.test_runtime_ignores(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_is_ignored.TestIsIgnored.test_runtime_ignores(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_is_ignored.TestIsIgnored.test_runtime_ignores(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_failing_to_lock_branch_does_not_lock(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_failing_to_lock_branch_does_not_lock(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_failing_to_lock_branch_does_not_lock(WorkingTreeFormat3)
 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_branch_does_not_lock(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_failing_to_lock_tree_write_branch_does_not_lock(GitWorkingTreeFormat)
 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(WorkingTreeFormat3)
 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)
+breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_failing_to_lock_tree_write_branch_does_not_lock(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_failing_to_lock_write_branch_does_not_lock(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_failing_to_lock_write_branch_does_not_lock(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_failing_to_lock_write_branch_does_not_lock(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_failing_to_lock_write_branch_does_not_lock(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_failing_to_lock_write_branch_does_not_lock(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_failing_to_lock_write_branch_does_not_lock(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_failing_to_lock_write_branch_does_not_lock(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_lock_read_returns_unlocker(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_lock_read_returns_unlocker(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_lock_read_returns_unlocker(WorkingTreeFormat3)
@@ -9326,11 +9551,13 @@
 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)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_lock_tree_write_returns_unlocker(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_lock_write_returns_unlocker(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_lock_write_returns_unlocker(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_lock_write_returns_unlocker(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_lock_write_returns_unlocker(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_lock_write_returns_unlocker(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_lock_write_returns_unlocker(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_lock_write_returns_unlocker(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_read_unlock(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_read_unlock(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_read_unlock(WorkingTreeFormat3)
@@ -9352,16 +9579,20 @@
 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)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_tree_write_unlock(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_write_unlock(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_write_unlock(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_write_unlock(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_write_unlock(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_write_unlock(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_write_unlock(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_trivial_lock_write_unlock(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_unlock_branch_failures(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_unlock_branch_failures(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_unlock_branch_failures(WorkingTreeFormat3)
 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_locking.TestWorkingTreeLocking.test_unlock_branch_failures(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_unlock_from_tree_write_lock_flushes(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_unlock_from_tree_write_lock_flushes(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_unlock_from_tree_write_lock_flushes(WorkingTreeFormat4)
@@ -9373,6 +9604,7 @@
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_unlock_from_write_lock_flushes(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_unlock_from_write_lock_flushes(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_unlock_from_write_lock_flushes(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_locking.TestWorkingTreeLocking.test_unlock_from_write_lock_flushes(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_compare_after_merge(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_compare_after_merge(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_compare_after_merge(WorkingTreeFormat5)
@@ -9393,11 +9625,14 @@
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_smoking_merge(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_smoking_merge(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_smoking_merge(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_mkdir.TestMkdir.test_mkdir_no_id(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_mkdir.TestMkdir.test_mkdir_no_id(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_mkdir.TestMkdir.test_mkdir_no_id(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_mkdir.TestMkdir.test_mkdir_no_id(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_mkdir.TestMkdir.test_mkdir_no_id(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_mkdir.TestMkdir.test_mkdir_no_id(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_mkdir.TestMkdir.test_mkdir_no_id(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_mkdir.TestMkdir.test_mkdir_with_id(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_after_with_after(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_after_with_after(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_after(WorkingTreeFormat2)
@@ -9632,11 +9867,13 @@
 breezy.tests.per_workingtree.test_put_file.TestPutFileBytesNonAtomic.test_put_existing_file(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_put_file.TestPutFileBytesNonAtomic.test_put_existing_file(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_put_file.TestPutFileBytesNonAtomic.test_put_existing_file(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_put_file.TestPutFileBytesNonAtomic.test_put_existing_file(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_put_file.TestPutFileBytesNonAtomic.test_put_new_file(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_put_file.TestPutFileBytesNonAtomic.test_put_new_file(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_put_file.TestPutFileBytesNonAtomic.test_put_new_file(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_put_file.TestPutFileBytesNonAtomic.test_put_new_file(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_put_file.TestPutFileBytesNonAtomic.test_put_new_file(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_put_file.TestPutFileBytesNonAtomic.test_put_new_file(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_read_working_inventory.TestReadWorkingInventory.test_read_after_inventory_modification(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_read_working_inventory.TestReadWorkingInventory.test_read_after_inventory_modification(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_read_working_inventory.TestReadWorkingInventory.test_read_after_inventory_modification(WorkingTreeFormat3)
@@ -9795,12 +10032,14 @@
 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_set_root_id.TestSetRootId.test_set_and_read_unicode(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_set_root_id.TestSetRootId.test_set_root_id(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_set_root_id.TestSetRootId.test_set_root_id(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_set_root_id.TestSetRootId.test_set_root_id(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_set_root_id.TestSetRootId.test_set_root_id(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_set_root_id.TestSetRootId.test_set_root_id(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_set_root_id.TestSetRootId.test_set_root_id(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_set_root_id.TestSetRootId.test_set_root_id(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_shelf_manager.TestShelfManager.test_shelf_manager(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_shelf_manager.TestShelfManager.test_shelf_manager(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_shelf_manager.TestShelfManager.test_shelf_manager(WorkingTreeFormat3)
@@ -9808,6 +10047,11 @@
 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_shelf_manager.TestShelfManager.test_shelf_manager(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_smart_add.TestSmartAddConflictRelatedFiles.test_can_add_generated_files_explicitly(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_smart_add.TestSmartAddConflictRelatedFiles.test_can_add_generated_files_explicitly(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_smart_add.TestSmartAddConflictRelatedFiles.test_can_add_generated_files_explicitly(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_smart_add.TestSmartAddConflictRelatedFiles.test_can_add_generated_files_explicitly(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_smart_add.TestSmartAddConflictRelatedFiles.test_cant_add_generated_files_implicitly(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_add_above_tree_preserves_tree(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_add_above_tree_preserves_tree(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_add_above_tree_preserves_tree(WorkingTreeFormat4)
@@ -9881,11 +10125,13 @@
 breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_returns_and_ignores(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_returns_and_ignores(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_returns_and_ignores(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_save_false(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_save_false(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_save_false(WorkingTreeFormat3)
 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_save_false(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_single_file(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_single_file(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_skip_nested_trees(WorkingTreeFormat2)
@@ -9959,6 +10205,7 @@
 breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_several_files(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_several_files(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_several_files(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_several_files(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree_and_children(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree_and_children(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree(WorkingTreeFormat2)
@@ -9974,6 +10221,7 @@
 breezy.tests.per_workingtree.test_views.TestTreeViews.test_delete_view(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_views.TestTreeViews.test_delete_view(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_views.TestTreeViews.test_delete_view(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_views.TestTreeViews.test_delete_view(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_views.TestTreeViews.test_lookup_view(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_views.TestTreeViews.test_lookup_view(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_views.TestTreeViews.test_lookup_view(WorkingTreeFormat3)
@@ -9997,6 +10245,7 @@
 breezy.tests.per_workingtree.test_views.TestTreeViews.test_set_view(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_views.TestTreeViews.test_set_view(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_views.TestTreeViews.test_set_view(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_views.TestTreeViews.test_set_view(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_views.TestTreeViews.test_unicode_view(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_views.TestTreeViews.test_unicode_view(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_views.TestTreeViews.test_unicode_view(WorkingTreeFormat3)
@@ -10120,6 +10369,10 @@
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_case_sensitive(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_case_sensitive(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_case_sensitive(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_clear_merge_conflicts(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_clear_merge_conflicts(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_clear_merge_conflicts(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_clear_merge_conflicts(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_clone_and_commit_preserves_last_revision(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_clone_and_commit_preserves_last_revision(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_clone_and_commit_preserves_last_revision(WorkingTreeFormat4)
@@ -10152,6 +10405,7 @@
 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_detect_real_kind(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_filter_unversioned_files(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_filter_unversioned_files(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_filter_unversioned_files(WorkingTreeFormat4)
@@ -10202,11 +10456,17 @@
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_list_files(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_list_files(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_list_files(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_lock_locks_branch(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_lock_locks_branch(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_lock_locks_branch(WorkingTreeFormat3)
 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_lock_locks_branch(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_conflicts(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_conflicts(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_conflicts(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_conflicts(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_modified_detects_corruption(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_missing_file_sha1(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_missing_file_sha1(WorkingTreeFormat3)
@@ -10237,6 +10497,8 @@
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_post_build_tree_hook(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_rename_dirs(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_rename_dirs(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_revert_clear_conflicts2(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_revert_clear_conflicts(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_revert_missing(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_revert_missing(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_revert_missing(WorkingTreeFormat4)
@@ -10299,18 +10561,21 @@
 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_invalid(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_workingtree.TestWorthSavingLimit.test_not_set(GitWorkingTreeFormat)
 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_not_set(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_workingtree.TestWorthSavingLimit.test_set_in_branch(GitWorkingTreeFormat)
 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)
+breezy.tests.per_workingtree.test_workingtree.TestWorthSavingLimit.test_set_in_branch(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.TestWtScenarios.test_protect_wt_scenarios
 breezy.tests.test_ancestry.TestAncestry.test_straightline_ancestry
 breezy.tests.test_annotate.TestReannotate.test_reannotate
@@ -10761,6 +11026,9 @@
 breezy.tests.test_chk_map.TestNode.test_equal
 breezy.tests.test_chk_map.TestNode.test_no_common_prefix
 breezy.tests.test_chk_map.TestNode.test_not_a_prefix
+breezy.tests.test_chk_serializer.TestBEncodeSerializer1.test_roundtrips_non_ascii
+breezy.tests.test_chk_serializer.TestBEncodeSerializer1.test_roundtrips_xml_invalid_chars
+breezy.tests.test_chk_serializer.TestBEncodeSerializer1.test_unpack_revision_no_timezone
 breezy.tests.test__chunks_to_lines.TestChunksToLines.test_fulltext_chunk_to_lines(python)
 breezy.tests.test__chunks_to_lines.TestChunksToLines.test_lines_to_lines(python)
 breezy.tests.test__chunks_to_lines.TestChunksToLines.test_mixed(python)
@@ -10774,6 +11042,7 @@
 breezy.tests.test_chunk_writer.TestWriter.test_too_much_data_does_not_exceed_size
 breezy.tests.test_chunk_writer.TestWriter.test_too_much_data_preserves_reserve_space
 breezy.tests.test_clean_tree.TestCleanTree.test_delete_items_warnings
+breezy.tests.test_clean_tree.TestCleanTree.test_iter_deletable
 breezy.tests.test_clean_tree.TestCleanTree.test_symlinks
 breezy.tests.test_cleanup.TestDoWithCleanups.test_cleanup_error_debug_flag
 breezy.tests.test_cleanup.TestDoWithCleanups.test_func_and_cleanup_errors_debug_flag
@@ -10848,7 +11117,9 @@
 breezy.tests.test_commit.TestCommit.test_commit_callback
 breezy.tests.test_commit.TestCommit.test_commit_empty
 breezy.tests.test_commit.TestCommit.test_commit_empty_authors_list
+breezy.tests.test_commit.TestCommit.test_commit_failed_signature
 breezy.tests.test_commit.TestCommit.test_commit_has_1ms_resolution
+breezy.tests.test_commit.TestCommit.test_commit_invokes_hooks
 breezy.tests.test_commit.TestCommit.test_commit_no_author
 breezy.tests.test_commit.TestCommit.test_commit_object_doesnt_set_nick
 breezy.tests.test_commit.TestCommit.test_commit_removals_respects_filespec
@@ -10864,8 +11135,11 @@
 breezy.tests.test_commit.TestCommit.test_removed_commit
 breezy.tests.test_commit.TestCommit.test_reused_rev_id
 breezy.tests.test_commit.TestCommit.test_safe_master_lock
+breezy.tests.test_commit.TestCommit.test_selected_file_merge_commit
 breezy.tests.test_commit.TestCommit.test_simple_commit
 breezy.tests.test_commit.TestCommit.test_strict_commit
+breezy.tests.test_config.TestAuthenticationConfigFilePermissions.test_check_suppressed_warning
+breezy.tests.test_config.TestAuthenticationConfigFilePermissions.test_check_warning
 breezy.tests.test_config.TestAuthenticationConfigFile.test_auth_section_header_not_closed
 breezy.tests.test_config.TestAuthenticationConfigFile.test_auth_value_not_boolean
 breezy.tests.test_config.TestAuthenticationConfigFile.test_auth_value_not_int
@@ -10890,6 +11164,7 @@
 breezy.tests.test_config.TestAuthenticationStorage.test_reset_credentials_different_name
 breezy.tests.test_config.TestAuthenticationStorage.test_set_credentials
 breezy.tests.test_config.TestAutoUserId.test_auto_user_id
+breezy.tests.test_config.TestBaseStackGet.test_get_first_definition
 breezy.tests.test_config.TestBaseStackGet.test_get_for_broken_callable
 breezy.tests.test_config.TestBaseStackGet.test_get_for_empty_section_callable
 breezy.tests.test_config.TestBaseStackGet.test_get_without_default_value_for_not_registered
@@ -10960,6 +11235,8 @@
 breezy.tests.test_config.TestConfigGetSections.test_locations_default_section
 breezy.tests.test_config.TestConfigGetSections.test_locations_matching_sections
 breezy.tests.test_config.TestConfigGetSections.test_locations_named_section
+breezy.tests.test_config.TestConfigObj.test_get_bool
+breezy.tests.test_config.TestConfigObj.test_hash_sign_in_value
 breezy.tests.test_config.TestConfigObj.test_triple_quotes
 breezy.tests.test_config.TestConfigPathFallback.test_authentication_config_filename
 breezy.tests.test_config.TestConfigPathFallback.test_config_dir
@@ -11040,6 +11317,7 @@
 breezy.tests.test_config.TestIniConfigOptionExpansion.test_simple_ref
 breezy.tests.test_config.TestIniConfigOptionExpansion.test_unknown_ref
 breezy.tests.test_config.TestIniConfigSaving.test_cant_save_without_a_file_name
+breezy.tests.test_config.TestIniFileStoreContent.test_load_erroneous_content
 breezy.tests.test_config.TestIniFileStoreContent.test_load_permission_denied
 breezy.tests.test_config.TestIniFileStoreContent.test_load_utf8
 breezy.tests.test_config.TestIterOptionRefs.test_broken_ref
@@ -11131,6 +11409,10 @@
 breezy.tests.test_config.TestMutableStore.test_set_option_in_empty_store(control)
 breezy.tests.test_config.TestMutableStore.test_set_option_in_empty_store(location)
 breezy.tests.test_config.TestMutableStore.test_set_option_in_empty_store(remote_branch)
+breezy.tests.test_config.TestOldConfigHooksForRemote.test_get_hook_remote_branch
+breezy.tests.test_config.TestOldConfigHooksForRemote.test_load_hook_remote_branch
+breezy.tests.test_config.TestOldConfigHooksForRemote.test_save_hook_remote_branch
+breezy.tests.test_config.TestOldConfigHooksForRemote.test_set_hook_remote_branch
 breezy.tests.test_config.TestOldConfigHooks.test_get_hook_branch
 breezy.tests.test_config.TestOldConfigHooks.test_get_hook_breezy
 breezy.tests.test_config.TestOldConfigHooks.test_get_hook_locations
@@ -11325,31 +11607,38 @@
 breezy.tests.test_config.TestStackGet.test_get_for_empty_stack(location)
 breezy.tests.test_config.TestStackGet.test_get_for_empty_stack(remote_control)
 breezy.tests.test_config.TestStackGet.test_get_hook(branch)
+breezy.tests.test_config.TestStackGet.test_get_hook(branch_only)
 breezy.tests.test_config.TestStackGet.test_get_hook(breezy)
 breezy.tests.test_config.TestStackGet.test_get_hook(location)
 breezy.tests.test_config.TestStackGet.test_get_hook(remote_control)
 breezy.tests.test_config.TestStackIterSections.test_empty_stack
 breezy.tests.test_config.TestStackRemove.test_remove_existing(branch)
+breezy.tests.test_config.TestStackRemove.test_remove_existing(branch_only)
 breezy.tests.test_config.TestStackRemove.test_remove_existing(breezy)
 breezy.tests.test_config.TestStackRemove.test_remove_existing(location)
 breezy.tests.test_config.TestStackRemove.test_remove_existing(remote_control)
 breezy.tests.test_config.TestStackRemove.test_remove_hook(branch)
+breezy.tests.test_config.TestStackRemove.test_remove_hook(branch_only)
 breezy.tests.test_config.TestStackRemove.test_remove_hook(breezy)
 breezy.tests.test_config.TestStackRemove.test_remove_hook(location)
 breezy.tests.test_config.TestStackRemove.test_remove_hook(remote_control)
 breezy.tests.test_config.TestStackRemove.test_remove_unknown(branch)
+breezy.tests.test_config.TestStackRemove.test_remove_unknown(branch_only)
 breezy.tests.test_config.TestStackRemove.test_remove_unknown(breezy)
 breezy.tests.test_config.TestStackRemove.test_remove_unknown(location)
 breezy.tests.test_config.TestStackRemove.test_remove_unknown(remote_control)
 breezy.tests.test_config.TestStackSet.test_set_creates_a_new_section(branch)
+breezy.tests.test_config.TestStackSet.test_set_creates_a_new_section(branch_only)
 breezy.tests.test_config.TestStackSet.test_set_creates_a_new_section(breezy)
 breezy.tests.test_config.TestStackSet.test_set_creates_a_new_section(location)
 breezy.tests.test_config.TestStackSet.test_set_creates_a_new_section(remote_control)
 breezy.tests.test_config.TestStackSet.test_set_hook(branch)
+breezy.tests.test_config.TestStackSet.test_set_hook(branch_only)
 breezy.tests.test_config.TestStackSet.test_set_hook(breezy)
 breezy.tests.test_config.TestStackSet.test_set_hook(location)
 breezy.tests.test_config.TestStackSet.test_set_hook(remote_control)
 breezy.tests.test_config.TestStackSet.test_simple_set(branch)
+breezy.tests.test_config.TestStackSet.test_simple_set(branch_only)
 breezy.tests.test_config.TestStackSet.test_simple_set(breezy)
 breezy.tests.test_config.TestStackSet.test_simple_set(location)
 breezy.tests.test_config.TestStackSet.test_simple_set(remote_control)
@@ -11366,6 +11655,8 @@
 breezy.tests.test_config.TestSupressWarning.test_suppress_warning_known
 breezy.tests.test_config.TestSupressWarning.test_suppress_warning_unknown
 breezy.tests.test_config.TestTransportConfig.test_get_value
+breezy.tests.test_config.TestTransportConfig.test_load_erroneous_content
+breezy.tests.test_config.TestTransportConfig.test_load_non_ascii
 breezy.tests.test_config.TestTransportConfig.test_load_permission_denied
 breezy.tests.test_config.TestTransportConfig.test_load_utf8
 breezy.tests.test_config.TestTransportConfig.test_set_unset_default_stack_on
@@ -11712,6 +12003,7 @@
 breezy.tests.test_ftp_transport.TestFTPTestServerUI.test_no_prompt_for_password_when_using_auth_config
 breezy.tests.test_ftp_transport.TestFTPTestServerUI.test_no_prompt_for_username
 breezy.tests.test_ftp_transport.TestFTPTestServerUI.test_prompt_for_password
+breezy.tests.test_generate_ids.TestFileIds.test_gen_root_id
 breezy.tests.test_generate_ids.TestFileIds.test__next_id_suffix_sets_suffix
 breezy.tests.test_globbing.TestExceptionGlobster.test_exclusion_order
 breezy.tests.test_globbing.TestExceptionGlobster.test_exclusion_patterns
@@ -12773,12 +13065,25 @@
 breezy.tests.test_memorytree.TestMemoryTree.test_unversion
 breezy.tests.test_merge3.TestMerge3.test_allow_objects
 breezy.tests.test_merge_core.FunctionalMergeTest.test_trivial_star_merge
+breezy.tests.test_merge_core.MergeTest.test_new_suffix
+breezy.tests.test_merge_core.MergeTest.test_no_passive_add
+breezy.tests.test_merge_core.TestMerger.test_from_revision_ids
+breezy.tests.test_merge_core.TestMerger.test_from_uncommitted
+breezy.tests.test_merge_directive.TestMergeDirective1Branch.test_disk_name_old_revno
+breezy.tests.test_merge_directive.TestMergeDirective1Branch.test_get_target_revision_nofetch
 breezy.tests.test_merge_directive.TestMergeDirective1Branch.test_handle_target_not_a_branch
+breezy.tests.test_merge_directive.TestMergeDirective1Branch.test_install_revisions_branch
+breezy.tests.test_merge_directive.TestMergeDirective1Branch.test_message
+breezy.tests.test_merge_directive.TestMergeDirective1Branch.test_use_public_submit_branch
 breezy.tests.test_merge_directive.TestMergeDirective1Branch.test_use_submit_for_missing_dependency
 breezy.tests.test_merge_directive.TestMergeDirective1.test_deserialize_empty
 breezy.tests.test_merge_directive.TestMergeDirective1.test_deserialize_junk
 breezy.tests.test_merge_directive.TestMergeDirective1.test_merge_source
 breezy.tests.test_merge_directive.TestMergeDirective1.test_require_patch
+breezy.tests.test_merge_directive.TestMergeDirective2Branch.test_get_target_revision_nofetch
+breezy.tests.test_merge_directive.TestMergeDirective2Branch.test_install_revisions_branch
+breezy.tests.test_merge_directive.TestMergeDirective2Branch.test_message
+breezy.tests.test_merge_directive.TestMergeDirective2Branch.test_use_public_submit_branch
 breezy.tests.test_merge_directive.TestMergeDirective2.test_deserialize_empty
 breezy.tests.test_merge_directive.TestMergeDirective2.test_deserialize_junk
 breezy.tests.test_merge_directive.TestMergeDirective2.test_merge_source
@@ -12820,6 +13125,8 @@
 breezy.tests.test_missing.TestFindUnmerged.test_restrict
 breezy.tests.test_missing.TestFindUnmerged.test_revision_range
 breezy.tests.test_missing.TestFindUnmerged.test_same_branch
+breezy.tests.test_msgeditor.MsgEditorTest.test_commit_template
+breezy.tests.test_msgeditor.MsgEditorTest.test_commit_template_encoded
 breezy.tests.test_msgeditor.MsgEditorTest.test_commit_template_pending_merges
 breezy.tests.test_msgeditor.MsgEditorTest.test__create_temp_file_with_commit_template_in_unicode_dir(cp1251)
 breezy.tests.test_msgeditor.MsgEditorTest.test__create_temp_file_with_commit_template_in_unicode_dir(iso-8859-1)
@@ -13182,11 +13489,14 @@
 breezy.tests.test_reconfigure.TestReconfigure.test_branch_to_branch
 breezy.tests.test_reconfigure.TestReconfigure.test_branch_to_lightweight_checkout
 breezy.tests.test_reconfigure.TestReconfigure.test_branch_to_lightweight_checkout_failure
+breezy.tests.test_reconfigure.TestReconfigure.test_branch_to_lightweight_checkout_fetch_tags
 breezy.tests.test_reconfigure.TestReconfigure.test_branch_to_tree
 breezy.tests.test_reconfigure.TestReconfigure.test_checkout_to_branch
 breezy.tests.test_reconfigure.TestReconfigure.test_checkout_to_checkout
 breezy.tests.test_reconfigure.TestReconfigure.test_lightweight_checkout_to_branch
+breezy.tests.test_reconfigure.TestReconfigure.test_lightweight_checkout_to_branch_tags
 breezy.tests.test_reconfigure.TestReconfigure.test_lightweight_checkout_to_checkout
+breezy.tests.test_reconfigure.TestReconfigure.test_lightweight_checkout_to_checkout_tags
 breezy.tests.test_reconfigure.TestReconfigure.test_lightweight_checkout_to_lightweight_checkout
 breezy.tests.test_reconfigure.TestReconfigure.test_lightweight_checkout_to_tree_preserves_reference_locations
 breezy.tests.test_reconfigure.TestReconfigure.test_lightweight_conversion_uses_shared_repo
@@ -13241,6 +13551,7 @@
 breezy.tests.test_remote.BasicRemoteObjectTests.test_remote_branch_format_supports_stacking(HPSS-v3)
 breezy.tests.test_remote.BasicRemoteObjectTests.test_remote_branch_repr(HPSS-v2)
 breezy.tests.test_remote.BasicRemoteObjectTests.test_remote_branch_repr(HPSS-v3)
+breezy.tests.test_remote.BasicRemoteObjectTests.test_remote_branch_set_append_revisions_only(HPSS-v3)
 breezy.tests.test_remote.BasicRemoteObjectTests.test_remote_branch_set_append_revisions_only_upgrade_reqd(HPSS-v3)
 breezy.tests.test_remote.BasicRemoteObjectTests.test_remote_bzrdir_repr(HPSS-v2)
 breezy.tests.test_remote.BasicRemoteObjectTests.test_remote_bzrdir_repr(HPSS-v3)
@@ -13255,6 +13566,8 @@
 breezy.tests.test_remote.TestBranchGetPhysicalLockStatus.test_get_physical_lock_status_yes
 breezy.tests.test_remote.TestBranchGetPutConfigStore.test_get_branch_conf
 breezy.tests.test_remote.TestBranchGetPutConfigStore.test_set_branch_conf
+breezy.tests.test_remote.TestBranchGetSetConfig.test_backwards_compat_set_option
+breezy.tests.test_remote.TestBranchGetSetConfig.test_backwards_compat_set_option_with_dict
 breezy.tests.test_remote.TestBranchGetSetConfig.test_get_branch_conf
 breezy.tests.test_remote.TestBranchGetSetConfig.test_get_multi_line_branch_conf
 breezy.tests.test_remote.TestBranchGetSetConfig.test_set_option
@@ -13278,6 +13591,7 @@
 breezy.tests.test_remote.TestBranchSetLastRevision.test_set_empty
 breezy.tests.test_remote.TestBranchSetLastRevision.test_set_nonempty
 breezy.tests.test_remote.TestBranchSetLastRevision.test_tip_change_rejected
+breezy.tests.test_remote.TestBranchSetParentLocation.test_backwards_compat
 breezy.tests.test_remote.TestBranchSetParentLocation.test_no_parent
 breezy.tests.test_remote.TestBranchSetParentLocation.test_parent
 breezy.tests.test_remote.TestBranchSetTagsBytes.test_backwards_compatible
@@ -13950,6 +14264,7 @@
 breezy.tests.test_smart.TestSmartServerBranchRequestLockWrite.test_lock_write_on_locked_repo
 breezy.tests.test_smart.TestSmartServerBranchRequestLockWrite.test_lock_write_on_readonly_transport
 breezy.tests.test_smart.TestSmartServerBranchRequestLockWrite.test_lock_write_on_unlocked_branch
+breezy.tests.test_smart.TestSmartServerBranchRequestLockWrite.test_lock_write_with_mismatched_tokens_on_locked_branch
 breezy.tests.test_smart.TestSmartServerBranchRequestLockWrite.test_lock_write_with_tokens_on_locked_branch
 breezy.tests.test_smart.TestSmartServerBranchRequestPutConfigFile.test_with_content
 breezy.tests.test_smart.TestSmartServerBranchRequestRevisionIdToRevno.test_not_found