diff -r 9f84ccb1b282 -r fe5e30b58934 mercurial/upgrade.py --- a/mercurial/upgrade.py Mon Apr 10 18:01:29 2017 +0200 +++ b/mercurial/upgrade.py Mon Apr 10 18:03:11 2017 +0200 @@ -78,7 +78,7 @@ 'store', ]) -def upgradeallowednewrequirements(repo): +def allowednewrequirements(repo): """Obtain requirements that can be added to a repository during upgrade. This is used to disallow proposed requirements from being added when @@ -613,7 +613,7 @@ 'removed: %s') % _(', ').join(sorted(noremovereqs))) noaddreqs = (newreqs - repo.requirements - - upgradeallowednewrequirements(repo)) + allowednewrequirements(repo)) if noaddreqs: raise error.Abort(_('cannot upgrade repository; do not support adding ' 'requirement: %s') %