Mercurial > hg
view tests/test-merge-subrepos.t @ 22583:23c995ed466b
config: don't read the same config file twice
In some cases some config files would be read twice and shown twice in
showconfig --debug.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Thu, 04 Sep 2014 21:36:35 +0200 |
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]