--- a/mercurial/transaction.py	Thu Feb 23 04:53:34 2023 +0100
+++ b/mercurial/transaction.py	Thu Feb 23 15:37:46 2023 +0100
@@ -692,6 +692,10 @@
         if entries:
             return False
         for e in self._backupentries:
+            if e[0] == b'plain' and e[1] == b'branch':
+                # XXX integrate branch to the transaction and get rid of this
+                # aberration
+                continue
             if e[1]:
                 return False
         return True
@@ -701,7 +705,9 @@
         assert self._can_quick_abort(entries)
         tmp_files = [e for e in self._backupentries if not e[1]]
         for vfs_id, old_path, tmp_path, xxx in tmp_files:
-            assert not old_path
+            # XXX integrate branch to the transaction and get rid of this
+            # aberration
+            assert not old_path or old_path == b'branch'
             vfs = self._vfsmap[vfs_id]
             try:
                 vfs.unlink(tmp_path)