Mercurial > hg
comparison tests/test-rebase-detach.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 |
comparison
equal
deleted
inserted
replaced
21266:19d6fec60b81 | 21267:e4f451c8c05c |
---|---|
372 warning: conflicts during merge. | 372 warning: conflicts during merge. |
373 merging H incomplete! (edit conflicts, then use 'hg resolve --mark') | 373 merging H incomplete! (edit conflicts, then use 'hg resolve --mark') |
374 unresolved conflicts (see hg resolve, then hg rebase --continue) | 374 unresolved conflicts (see hg resolve, then hg rebase --continue) |
375 [1] | 375 [1] |
376 $ hg resolve --all -t internal:local | 376 $ hg resolve --all -t internal:local |
377 no unresolved files; you may continue your unfinished operation | 377 no more unresolved files |
378 $ hg rebase -c | 378 $ hg rebase -c |
379 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob) | 379 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob) |
380 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" | 380 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
381 @ 7:draft 'H' | 381 @ 7:draft 'H' |
382 | | 382 | |