Mercurial > hg
view tests/test-merge-subrepos.t @ 13512:0a6bca3d5273 stable
i18n-pt_BR: synchronized with 9b617c56eb65
author | Wagner Bruna <wbruna@yahoo.com> |
---|---|
date | Tue, 01 Mar 2011 01:00:35 -0300 |
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]