Mercurial > hg
comparison tests/test-graft.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 | e741972017d9 |
comparison
equal
deleted
inserted
replaced
21266:19d6fec60b81 | 21267:e4f451c8c05c |
---|---|
218 | 218 |
219 Fix up: | 219 Fix up: |
220 | 220 |
221 $ echo b > e | 221 $ echo b > e |
222 $ hg resolve -m e | 222 $ hg resolve -m e |
223 no unresolved files; you may continue your unfinished operation | 223 no more unresolved files |
224 | 224 |
225 Continue with a revision should fail: | 225 Continue with a revision should fail: |
226 | 226 |
227 $ hg graft -c 6 | 227 $ hg graft -c 6 |
228 abort: can't specify --continue and revisions | 228 abort: can't specify --continue and revisions |
353 abort: unresolved conflicts, can't continue | 353 abort: unresolved conflicts, can't continue |
354 (use hg resolve and hg graft --continue) | 354 (use hg resolve and hg graft --continue) |
355 [255] | 355 [255] |
356 $ hg resolve --all | 356 $ hg resolve --all |
357 merging a | 357 merging a |
358 no unresolved files; you may continue your unfinished operation | 358 no more unresolved files |
359 $ hg graft -c | 359 $ hg graft -c |
360 grafting revision 1 | 360 grafting revision 1 |
361 $ hg export tip --git | 361 $ hg export tip --git |
362 # HG changeset patch | 362 # HG changeset patch |
363 # User bar | 363 # User bar |
382 abort: unresolved conflicts, can't continue | 382 abort: unresolved conflicts, can't continue |
383 (use hg resolve and hg graft --continue) | 383 (use hg resolve and hg graft --continue) |
384 [255] | 384 [255] |
385 $ hg resolve --all | 385 $ hg resolve --all |
386 merging a and b to b | 386 merging a and b to b |
387 no unresolved files; you may continue your unfinished operation | 387 no more unresolved files |
388 $ hg graft -c | 388 $ hg graft -c |
389 grafting revision 2 | 389 grafting revision 2 |
390 $ hg export tip --git | 390 $ hg export tip --git |
391 # HG changeset patch | 391 # HG changeset patch |
392 # User test | 392 # User test |