author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
Sun, 26 Apr 2015 13:43:01 -0400 | |
changeset 24930 | 0e06c9fc84ea |
parent 19803 | 0f64af33fb63 |
child 33198 | 439b4d005b4a |
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: uncommitted changes in subrepository 'subrepo' [255]