Mercurial > hg
diff tests/test-mq-qnew.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 | 25b7c760235a |
line wrap: on
line diff
--- a/tests/test-mq-qnew.t Fri Apr 18 22:19:25 2014 -0700 +++ b/tests/test-mq-qnew.t Fri May 09 14:46:50 2014 -0500 @@ -158,7 +158,7 @@ merging a incomplete! (edit conflicts, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon - no unresolved files; you may continue your unfinished operation + no more unresolved files abort: cannot manage merge changesets $ rm -r sandbox @@ -232,7 +232,7 @@ merging a incomplete! (edit conflicts, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon - no unresolved files; you may continue your unfinished operation + no more unresolved files abort: cannot manage merge changesets $ rm -r sandbox