comparison tests/test-graft.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)

21266:19d6fec60b81

Fix up:

  $ echo b > e
  $ hg resolve -m e
  no unresolved files; you may continue your unfinished operation

Continue with a revision should fail:

  $ hg graft -c 6
  abort: can't specify --continue and revisions

  abort: unresolved conflicts, can't continue
  (use hg resolve and hg graft --continue)
  [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
  # HG changeset patch
  # User bar

  abort: unresolved conflicts, can't continue
  (use hg resolve and hg graft --continue)
  [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
  # HG changeset patch
  # User test

21267:e4f451c8c05c

Fix up:

  $ echo b > e
  $ hg resolve -m e
  no more unresolved files

Continue with a revision should fail:

  $ hg graft -c 6
  abort: can't specify --continue and revisions

  abort: unresolved conflicts, can't continue
  (use hg resolve and hg graft --continue)
  [255]
  $ hg resolve --all
  merging a
  no more unresolved files
  $ hg graft -c
  grafting revision 1
  $ hg export tip --git
  # HG changeset patch
  # User bar

  abort: unresolved conflicts, can't continue
  (use hg resolve and hg graft --continue)
  [255]
  $ hg resolve --all
  merging a and b to b
  no more unresolved files
  $ hg graft -c
  grafting revision 2
  $ hg export tip --git
  # HG changeset patch
  # User test