diff 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
line wrap: on
line diff
--- a/tests/test-graft.t	Fri Apr 18 18:56:26 2014 -0700
+++ b/tests/test-graft.t	Fri Apr 18 22:19:25 2014 -0700
@@ -220,6 +220,7 @@
 
   $ echo b > e
   $ hg resolve -m e
+  no unresolved files; you may continue your unfinished operation
 
 Continue with a revision should fail:
 
@@ -354,6 +355,7 @@
   [255]
   $ hg resolve --all
   merging a
+  no unresolved files; you may continue your unfinished operation
   $ hg graft -c
   grafting revision 1
   $ hg export tip --git
@@ -382,6 +384,7 @@
   [255]
   $ hg resolve --all
   merging a and b to b
+  no unresolved files; you may continue your unfinished operation
   $ hg graft -c
   grafting revision 2
   $ hg export tip --git