Mercurial > hg
diff tests/test-histedit-fold-non-commute.t @ 21267:e4f451c8c05c
resolve: simplify "finished" message
The recently introduced message was:
no unresolved files; you may continue your unfinished operation
This had three problems:
- looks a bit like an error message because it's not saying "we've
just resolved the last file"
- refers to "unfinished operation", which won't be the case with
"update" or "merge"
- introduces semicolons to error messages, which is stylistically
questionable
I've simplified this to:
no more unresolved files
In the future, if we want to prompt someone to continue a particular operation, we should use
a hint style:
no more unresolved files
(use 'hg graft --continue' to finish grafting)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 09 May 2014 14:46:50 -0500 |
parents | 19d6fec60b81 |
children | b081decd9062 |
line wrap: on
line diff
--- a/tests/test-histedit-fold-non-commute.t Fri Apr 18 22:19:25 2014 -0700 +++ b/tests/test-histedit-fold-non-commute.t Fri May 09 14:46:50 2014 -0500 @@ -95,7 +95,7 @@ fix up $ echo 'I can haz no commute' > e $ hg resolve --mark e - no unresolved files; you may continue your unfinished operation + no more unresolved files $ cat > cat.py <<EOF > import sys > print open(sys.argv[1]).read() @@ -130,7 +130,7 @@ just continue this time $ hg revert -r 'p1()' e $ hg resolve --mark e - no unresolved files; you may continue your unfinished operation + no more unresolved files $ hg histedit --continue 2>&1 | fixbundle 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved