Mercurial > hg
view tests/test-merge-subrepos.t @ 21733:9ad11d5bcc2f
run-tests: don't check for the mercurial library used when using --with-hg
In the ``--with-hg`` case, we cannot properly infer the location of the mercurial
library, so we skip the warning completely.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Tue, 10 Jun 2014 14:32:52 -0700 |
parents | 0f64af33fb63 |
children | 439b4d005b4a |
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: uncommitted changes in subrepository 'subrepo' [255]