Mercurial > hg
view tests/test-merge-subrepos.t @ 24197:4e01b0332559 stable
i18n-de: fix a typo in the german translation
author | Alexander Becher <Alexander.Becher@RuD-Steuerungstechnik.De> |
---|---|
date | Wed, 04 Mar 2015 17:24:12 +0100 |
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]