Mercurial > hg
comparison tests/test-add.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 |
---|---|
105 a already tracked! | 105 a already tracked! |
106 $ hg st | 106 $ hg st |
107 M a | 107 M a |
108 ? a.orig | 108 ? a.orig |
109 $ hg resolve -m a | 109 $ hg resolve -m a |
110 no unresolved files; you may continue your unfinished operation | 110 no more unresolved files |
111 $ hg ci -m merge | 111 $ hg ci -m merge |
112 | 112 |
113 Issue683: peculiarity with hg revert of an removed then added file | 113 Issue683: peculiarity with hg revert of an removed then added file |
114 | 114 |
115 $ hg forget a | 115 $ hg forget a |