author | Mads Kiilerich <madski@unity3d.com> |
Fri, 18 Jan 2013 01:24:29 +0100 | |
changeset 18450 | 4f9a52858512 |
parent 13437 | 6169493ac3f9 |
child 19803 | 0f64af33fb63 |
permissions | -rw-r--r-- |
$ 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]