Mercurial > hg
comparison tests/test-rebase-parameters.t @ 21267:e4f451c8c05c
resolve: simplify "finished" message
The recently introduced message was:
no unresolved files; you may continue your unfinished operation
This had three problems:
- looks a bit like an error message because it's not saying "we've
just resolved the last file"
- refers to "unfinished operation", which won't be the case with
"update" or "merge"
- introduces semicolons to error messages, which is stylistically
questionable
I've simplified this to:
no more unresolved files
In the future, if we want to prompt someone to continue a particular operation, we should use
a hint style:
no more unresolved files
(use 'hg graft --continue' to finish grafting)
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 09 May 2014 14:46:50 -0500 |
| parents | 19d6fec60b81 |
| children | b081decd9062 |
comparison
equal
deleted
inserted
replaced
| 21266:19d6fec60b81 | 21267:e4f451c8c05c |
|---|---|
| 452 | 452 |
| 453 $ hg resolve -l | 453 $ hg resolve -l |
| 454 U c2 | 454 U c2 |
| 455 | 455 |
| 456 $ hg resolve -m c2 | 456 $ hg resolve -m c2 |
| 457 no unresolved files; you may continue your unfinished operation | 457 no more unresolved files |
| 458 $ hg rebase -c --tool internal:fail | 458 $ hg rebase -c --tool internal:fail |
| 459 tool option will be ignored | 459 tool option will be ignored |
| 460 saved backup bundle to $TESTTMP/b3/.hg/strip-backup/*-backup.hg (glob) | 460 saved backup bundle to $TESTTMP/b3/.hg/strip-backup/*-backup.hg (glob) |
| 461 | 461 |
| 462 $ cd .. | 462 $ cd .. |