view tests/test-merge-subrepos.t @ 14729:94eea58da2a3 stable

update: do not use the term 'update' when mentioning reverting one file

and give a more precise hint for how to revert such a file

I'm using the term 'revision' instead of 'changeset' in this change to be
consistent with the REV we use in the synopsis.

  $ hg init

  $ echo a > a
  $ hg ci -qAm 'add a'

  $ hg init subrepo
  $ echo 'subrepo = http://example.net/libfoo' > .hgsub
  $ hg ci -qAm 'added subrepo'

  $ hg up -qC 0
  $ echo ax > a
  $ hg ci -m 'changed a'
  created new head

  $ hg up -qC 1
  $ cd subrepo
  $ echo b > b
  $ hg add b
  $ cd ..

Should fail, since there are added files to subrepo:

  $ hg merge
  abort: outstanding uncommitted changes in subrepository 'subrepo'
  [255]