Mercurial > hg
diff 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 |
line wrap: on
line diff
--- a/tests/test-mq-qnew.t Fri Apr 18 18:56:26 2014 -0700 +++ b/tests/test-mq-qnew.t Fri Apr 18 22:19:25 2014 -0700 @@ -158,6 +158,7 @@ merging a incomplete! (edit conflicts, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon + no unresolved files; you may continue your unfinished operation abort: cannot manage merge changesets $ rm -r sandbox @@ -231,6 +232,7 @@ merging a incomplete! (edit conflicts, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon + no unresolved files; you may continue your unfinished operation abort: cannot manage merge changesets $ rm -r sandbox