--- a/mercurial/bundle2.py Sun Sep 24 04:35:02 2023 +0200
+++ b/mercurial/bundle2.py Tue Oct 10 18:29:04 2023 +0200
@@ -896,7 +896,7 @@
"""utility to transfer a bundle2 as binary
This is made necessary by the fact the 'getbundle' command over 'ssh'
- have no way to know then the reply end, relying on the bundle to be
+ have no way to know when the reply ends, relying on the bundle to be
interpreted to know its end. This is terrible and we are sorry, but we
needed to move forward to get general delta enabled.
"""
--- a/mercurial/upgrade_utils/actions.py Sun Sep 24 04:35:02 2023 +0200
+++ b/mercurial/upgrade_utils/actions.py Tue Oct 10 18:29:04 2023 +0200
@@ -289,8 +289,7 @@
postdowngrademessage = _(
b'repository downgraded to not use share safe mode, '
- b'existing shares will not work and needs to'
- b' be reshared.'
+ b'existing shares will not work and need to be reshared.'
)
postupgrademessage = _(
@@ -359,7 +358,7 @@
description = _(b'Stores copies information alongside changesets.')
upgrademessage = _(
- b'Allows to use more efficient algorithm to deal with ' b'copy tracing.'
+ b'Allows to use more efficient algorithm to deal with copy tracing.'
)
touches_filelogs = False
--- a/tests/test-share-safe.t Sun Sep 24 04:35:02 2023 +0200
+++ b/tests/test-share-safe.t Tue Oct 10 18:29:04 2023 +0200
@@ -470,7 +470,7 @@
(it is safe to interrupt this process any time before data migration completes)
upgrading repository requirements
removing temporary repository $TESTTMP/non-share-safe/.hg/upgrade.* (glob)
- repository downgraded to not use share safe mode, existing shares will not work and needs to be reshared.
+ repository downgraded to not use share safe mode, existing shares will not work and need to be reshared.
$ hg debugrequirements
dotencode