diff mercurial/upgrade.py @ 48507:9dd151a39950

merge with stable
author Matt Harbison <matt_harbison@yahoo.com>
date Mon, 13 Dec 2021 14:44:16 -0500
parents dc2ef4b4d9a9 cb477edeca79
children a4d8de93023c
line wrap: on
line diff
--- a/mercurial/upgrade.py	Mon Dec 13 14:37:16 2021 +0100
+++ b/mercurial/upgrade.py	Mon Dec 13 14:44:16 2021 -0500
@@ -323,7 +323,7 @@
         ui.warn(_(b'repository upgraded to use share-safe mode\n'))
     except error.LockError as e:
         hint = _(
-            "see `hg help config.format.use-share-safe` for more information"
+            b"see `hg help config.format.use-share-safe` for more information"
         )
         if mismatch_config == b'upgrade-abort':
             raise error.Abort(
@@ -380,7 +380,7 @@
         ui.warn(_(b'repository downgraded to not use share-safe mode\n'))
     except error.LockError as e:
         hint = _(
-            "see `hg help config.format.use-share-safe` for more information"
+            b"see `hg help config.format.use-share-safe` for more information"
         )
         # If upgrade-abort is set, abort when upgrade fails, else let the
         # process continue as `upgrade-allow` is set