Mercurial > hg
comparison tests/test-rebase-conflicts.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 | cb15835456cb |
comparison
equal
deleted
inserted
replaced
| 21266:19d6fec60b81 | 21267:e4f451c8c05c |
|---|---|
| 75 | 75 |
| 76 Conclude rebase: | 76 Conclude rebase: |
| 77 | 77 |
| 78 $ echo 'resolved merge' >common | 78 $ echo 'resolved merge' >common |
| 79 $ hg resolve -m common | 79 $ hg resolve -m common |
| 80 no unresolved files; you may continue your unfinished operation | 80 no more unresolved files |
| 81 $ hg rebase --continue | 81 $ hg rebase --continue |
| 82 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) | 82 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) |
| 83 | 83 |
| 84 $ hg tglog | 84 $ hg tglog |
| 85 @ 5:secret 'L3' mybook | 85 @ 5:secret 'L3' mybook |