comparison tests/test-log.t @ 37920:ea63a2004d09

update: print warning about hidden changeset after update

When an attempt to update to a hidden changeset fails because the
working copy is dirty, you may get a message like this:

  updating to a hidden changeset 343f6de32686
  (hidden revision '343f6de32686' was rewritten as: 4ab941244072)
  abort: conflicting changes
  (commit or update --clean to discard changes)

It's easy to miss the real error here. This patch moves the warning
about the hidden changeset to after the update has happened. It
changes the verb tense accordingly (and drops the "a" that I think it
sounds better without). Of course, this means that the commit isn't
actually hidden anymore when the message is printed. I think that's
fine.

Differential Revision: https://phab.mercurial-scm.org/D3479

37919:7a97a622244d

  [255]

test that parent prevent a changeset to be hidden

  $ hg up 1 -q --hidden
  updating to a hidden changeset a765632148dc
  (hidden revision 'a765632148dc' is pruned)
  $ hg log --template='{rev}:{node}\n'
  1:a765632148dc55d38c35c4f247c618701886cb2f
  0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05

37920:ea63a2004d09

  [255]

test that parent prevent a changeset to be hidden

  $ hg up 1 -q --hidden
  updated to hidden changeset a765632148dc
  (hidden revision 'a765632148dc' is pruned)
  $ hg log --template='{rev}:{node}\n'
  1:a765632148dc55d38c35c4f247c618701886cb2f
  0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05