Mercurial > hg
comparison tests/test-rebase-mq-skip.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 | aa9385f983fa |
| children | e4f451c8c05c |
comparison
equal
deleted
inserted
replaced
| 21265:232de244ab6f | 21266:19d6fec60b81 |
|---|---|
| 109 $ HGMERGE=internal:fail hg rebase | 109 $ HGMERGE=internal:fail hg rebase |
| 110 unresolved conflicts (see hg resolve, then hg rebase --continue) | 110 unresolved conflicts (see hg resolve, then hg rebase --continue) |
| 111 [1] | 111 [1] |
| 112 | 112 |
| 113 $ HGMERGE=internal:local hg resolve --all | 113 $ HGMERGE=internal:local hg resolve --all |
| 114 no unresolved files; you may continue your unfinished operation | |
| 114 | 115 |
| 115 $ hg rebase --continue | 116 $ hg rebase --continue |
| 116 saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob) | 117 saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob) |
| 117 | 118 |
| 118 $ hg tglog | 119 $ hg tglog |