Mercurial > hg
comparison tests/test-graft.t @ 21947:b081decd9062 stable
resolve: add parenthesis around "no more unresolved files" message
This message may be confused with an error message. Adding parenthesis around it
will make it more recognisable as an informative message.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Sat, 26 Jul 2014 03:32:49 +0200 |
| parents | 44255f7ce886 |
| children | c2863cfe8a8a 9472284df4eb |
comparison
equal
deleted
inserted
replaced
| 21946:868e2cea3ea0 | 21947:b081decd9062 |
|---|---|
| 233 | 233 |
| 234 Fix up: | 234 Fix up: |
| 235 | 235 |
| 236 $ echo b > e | 236 $ echo b > e |
| 237 $ hg resolve -m e | 237 $ hg resolve -m e |
| 238 no more unresolved files | 238 (no more unresolved files) |
| 239 | 239 |
| 240 Continue with a revision should fail: | 240 Continue with a revision should fail: |
| 241 | 241 |
| 242 $ hg graft -c 6 | 242 $ hg graft -c 6 |
| 243 abort: can't specify --continue and revisions | 243 abort: can't specify --continue and revisions |
| 368 abort: unresolved conflicts, can't continue | 368 abort: unresolved conflicts, can't continue |
| 369 (use hg resolve and hg graft --continue) | 369 (use hg resolve and hg graft --continue) |
| 370 [255] | 370 [255] |
| 371 $ hg resolve --all | 371 $ hg resolve --all |
| 372 merging a | 372 merging a |
| 373 no more unresolved files | 373 (no more unresolved files) |
| 374 $ hg graft -c | 374 $ hg graft -c |
| 375 grafting revision 1 | 375 grafting revision 1 |
| 376 $ hg export tip --git | 376 $ hg export tip --git |
| 377 # HG changeset patch | 377 # HG changeset patch |
| 378 # User bar | 378 # User bar |
| 397 abort: unresolved conflicts, can't continue | 397 abort: unresolved conflicts, can't continue |
| 398 (use hg resolve and hg graft --continue) | 398 (use hg resolve and hg graft --continue) |
| 399 [255] | 399 [255] |
| 400 $ hg resolve --all | 400 $ hg resolve --all |
| 401 merging a and b to b | 401 merging a and b to b |
| 402 no more unresolved files | 402 (no more unresolved files) |
| 403 $ hg graft -c | 403 $ hg graft -c |
| 404 grafting revision 2 | 404 grafting revision 2 |
| 405 $ hg export tip --git | 405 $ hg export tip --git |
| 406 # HG changeset patch | 406 # HG changeset patch |
| 407 # User test | 407 # User test |