Mercurial > hg
view tests/test-merge-subrepos.t @ 18048:9b7288fc7bf2
run-tests: use correct python when run with --local
author | Bryan O'Sullivan <bryano@fb.com> |
---|---|
date | Mon, 10 Dec 2012 12:07:42 -0800 |
parents | 6169493ac3f9 |
children | 0f64af33fb63 |
line wrap: on
line source
$ 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]