comparison tests/test-fileset.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
152 $ fileset 'resolved()' 152 $ fileset 'resolved()'
153 $ fileset 'unresolved()' 153 $ fileset 'unresolved()'
154 b2 154 b2
155 $ echo e > b2 155 $ echo e > b2
156 $ hg resolve -m b2 156 $ hg resolve -m b2
157 no unresolved files; you may continue your unfinished operation 157 no more unresolved files
158 $ fileset 'resolved()' 158 $ fileset 'resolved()'
159 b2 159 b2
160 $ fileset 'unresolved()' 160 $ fileset 'unresolved()'
161 $ hg ci -m merge 161 $ hg ci -m merge
162 162