tests/test-merge-subrepos.t
author Martin Geisler <mg@aragost.com>
Tue, 10 May 2011 13:19:05 +0200
changeset 14285 aa64a87b493d
parent 13437 6169493ac3f9
child 19803 0f64af33fb63
permissions -rw-r--r--
help: give hint about 'hg help -e' when appropriate The hint is only given if a command shadows an extension with the same name and when that extension has a multi-line module docstring.

  $ 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]