--- a/tests/test-fastannotate-hg.t Sat Jul 18 18:38:46 2020 +0900
+++ b/tests/test-fastannotate-hg.t Mon Jul 06 19:35:53 2020 +0200
@@ -485,7 +485,7 @@
> def reposetup(ui, repo):
> class legacyrepo(repo.__class__):
> def _filecommit(self, fctx, manifest1, manifest2,
- > linkrev, tr, changelist, includecopymeta):
+ > linkrev, tr, includecopymeta):
> fname = fctx.path()
> text = fctx.data()
> flog = self.file(fname)
@@ -496,9 +496,8 @@
> if copy and copy[0] != fname:
> raise error.Abort('copying is not supported')
> if fparent2 != node.nullid:
- > changelist.append(fname)
> return flog.add(text, meta, tr, linkrev,
- > fparent1, fparent2)
+ > fparent1, fparent2), 'modified'
> raise error.Abort('only merging is supported')
> repo.__class__ = legacyrepo
> EOF