diff --git a/mercurial/commands.py b/mercurial/commands.py index 77acd8ce01ce9f8250ea78887d858cf2fbdeca36_bWVyY3VyaWFsL2NvbW1hbmRzLnB5..1dee888b22f7fd4ee6bed29860ee8c57da08a552_bWVyY3VyaWFsL2NvbW1hbmRzLnB5 100644 --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -4512,7 +4512,7 @@ rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase] if rejected: - ui.warn(_('cannot move %i changesets to a more permissive ' + ui.warn(_('cannot move %i changesets to a higher ' 'phase, use --force\n') % len(rejected)) ret = 1 if changes: diff --git a/tests/test-phases.t b/tests/test-phases.t index 77acd8ce01ce9f8250ea78887d858cf2fbdeca36_dGVzdHMvdGVzdC1waGFzZXMudA==..1dee888b22f7fd4ee6bed29860ee8c57da08a552_dGVzdHMvdGVzdC1waGFzZXMudA== 100644 --- a/tests/test-phases.t +++ b/tests/test-phases.t @@ -482,7 +482,7 @@ $ hg phase --public 7 $ hg phase --draft '5 or 7' - cannot move 1 changesets to a more permissive phase, use --force + cannot move 1 changesets to a higher phase, use --force phase changed for 1 changesets [1] $ hg log -G --template "{rev} {phase} {desc}\n" @@ -506,7 +506,7 @@ test complete failure $ hg phase --draft 7 - cannot move 1 changesets to a more permissive phase, use --force + cannot move 1 changesets to a higher phase, use --force no phases changed [1]