Mercurial > hg
comparison tests/test-graft.t @ 21266:19d6fec60b81
resolve: print message when no unresolved files remain (issue4214)
When using resolve, users often have to consult with the output of |hg
resolve -l| to see if any unresolved files remain. This step is tedious
and adds overhead to resolving.
This patch will notify a user if there are no unresolved files remaining
after executing |hg resolve|::
no unresolved files; you may continue your unfinished operation
The patch stops short of telling the user exactly what command should be
executed to continue the unfinished operation. That is because this
information is not currently captured anywhere. This would make a
compelling follow-up feature.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Fri, 18 Apr 2014 22:19:25 -0700 |
| parents | a1381eea7c7d |
| children | e4f451c8c05c |
comparison
equal
deleted
inserted
replaced
| 21265:232de244ab6f | 21266:19d6fec60b81 |
|---|---|
| 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 | 224 |
| 224 Continue with a revision should fail: | 225 Continue with a revision should fail: |
| 225 | 226 |
| 226 $ hg graft -c 6 | 227 $ hg graft -c 6 |
| 227 abort: can't specify --continue and revisions | 228 abort: can't specify --continue and revisions |
| 352 abort: unresolved conflicts, can't continue | 353 abort: unresolved conflicts, can't continue |
| 353 (use hg resolve and hg graft --continue) | 354 (use hg resolve and hg graft --continue) |
| 354 [255] | 355 [255] |
| 355 $ hg resolve --all | 356 $ hg resolve --all |
| 356 merging a | 357 merging a |
| 358 no unresolved files; you may continue your unfinished operation | |
| 357 $ hg graft -c | 359 $ hg graft -c |
| 358 grafting revision 1 | 360 grafting revision 1 |
| 359 $ hg export tip --git | 361 $ hg export tip --git |
| 360 # HG changeset patch | 362 # HG changeset patch |
| 361 # User bar | 363 # User bar |
| 380 abort: unresolved conflicts, can't continue | 382 abort: unresolved conflicts, can't continue |
| 381 (use hg resolve and hg graft --continue) | 383 (use hg resolve and hg graft --continue) |
| 382 [255] | 384 [255] |
| 383 $ hg resolve --all | 385 $ hg resolve --all |
| 384 merging a and b to b | 386 merging a and b to b |
| 387 no unresolved files; you may continue your unfinished operation | |
| 385 $ hg graft -c | 388 $ hg graft -c |
| 386 grafting revision 2 | 389 grafting revision 2 |
| 387 $ hg export tip --git | 390 $ hg export tip --git |
| 388 # HG changeset patch | 391 # HG changeset patch |
| 389 # User test | 392 # User test |