##// END OF EJS Templates
phase: better error message when --force is needed...
Martin Geisler -
r20093:1dee888b stable
parent child Browse files
Show More
@@ -4512,7 +4512,7 b' def phase(ui, repo, *revs, **opts):'
4512 rejected = [n for n in nodes
4512 rejected = [n for n in nodes
4513 if newdata[cl.rev(n)] < targetphase]
4513 if newdata[cl.rev(n)] < targetphase]
4514 if rejected:
4514 if rejected:
4515 ui.warn(_('cannot move %i changesets to a more permissive '
4515 ui.warn(_('cannot move %i changesets to a higher '
4516 'phase, use --force\n') % len(rejected))
4516 'phase, use --force\n') % len(rejected))
4517 ret = 1
4517 ret = 1
4518 if changes:
4518 if changes:
@@ -482,7 +482,7 b' test partial failure'
482
482
483 $ hg phase --public 7
483 $ hg phase --public 7
484 $ hg phase --draft '5 or 7'
484 $ hg phase --draft '5 or 7'
485 cannot move 1 changesets to a more permissive phase, use --force
485 cannot move 1 changesets to a higher phase, use --force
486 phase changed for 1 changesets
486 phase changed for 1 changesets
487 [1]
487 [1]
488 $ hg log -G --template "{rev} {phase} {desc}\n"
488 $ hg log -G --template "{rev} {phase} {desc}\n"
@@ -506,7 +506,7 b' test partial failure'
506 test complete failure
506 test complete failure
507
507
508 $ hg phase --draft 7
508 $ hg phase --draft 7
509 cannot move 1 changesets to a more permissive phase, use --force
509 cannot move 1 changesets to a higher phase, use --force
510 no phases changed
510 no phases changed
511 [1]
511 [1]
512
512
General Comments 0
You need to be logged in to leave comments. Login now