Mercurial > hg
view tests/test-merge-subrepos.t @ 29572:d86b54d9bb0c
paper: make different blocks of annotated lines have different colors
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sat, 16 Jul 2016 14:49:07 +0800 |
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]