author | Siddharth Agarwal <sid0@fb.com> |
Wed, 25 Mar 2015 16:21:58 -0700 | |
changeset 24462 | 40b05303ac32 |
parent 19803 | 0f64af33fb63 |
child 33196 | 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]