1   $ hg init

     2 

     3   $ echo a > a

     4   $ hg ci -qAm 'add a'

     5 

     6   $ hg init subrepo

     7   $ echo 'subrepo = http://example.net/libfoo' > .hgsub

     8   $ hg ci -qAm 'added subrepo'

     9 

    10   $ hg up -qC 0

    11   $ echo ax > a

    12   $ hg ci -m 'changed a'

    13   created new head

    14 

    15   $ hg up -qC 1

    16   $ cd subrepo

    17   $ echo b > b

    18   $ hg add b

    19   $ cd ..

    20 

    21 Should fail, since there are added files to subrepo:

    22 

    23   $ hg merge

    24   abort: outstanding uncommitted changes in subrepository 'subrepo'

    25   [255]