Mercurial > hg
comparison tests/test-mq-qnew.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 | b9a16ed5acec |
| children | e4f451c8c05c |
comparison
equal
deleted
inserted
replaced
| 21265:232de244ab6f | 21266:19d6fec60b81 |
|---|---|
| 156 merging a | 156 merging a |
| 157 warning: conflicts during merge. | 157 warning: conflicts during merge. |
| 158 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') | 158 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
| 159 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 159 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 160 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 160 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 161 no unresolved files; you may continue your unfinished operation | |
| 161 abort: cannot manage merge changesets | 162 abort: cannot manage merge changesets |
| 162 $ rm -r sandbox | 163 $ rm -r sandbox |
| 163 | 164 |
| 164 hg headers | 165 hg headers |
| 165 | 166 |
| 229 merging a | 230 merging a |
| 230 warning: conflicts during merge. | 231 warning: conflicts during merge. |
| 231 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') | 232 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
| 232 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 233 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 233 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 234 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 235 no unresolved files; you may continue your unfinished operation | |
| 234 abort: cannot manage merge changesets | 236 abort: cannot manage merge changesets |
| 235 $ rm -r sandbox | 237 $ rm -r sandbox |
| 236 | 238 |
| 237 Test saving last-message.txt | 239 Test saving last-message.txt |
| 238 | 240 |