Mercurial > hg
view tests/test-merge-subrepos.t @ 26815:b57e5bfaad7c stable
Added signature for changeset b66e3ca0b90c
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 20 Oct 2015 16:00:02 -0500 |
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]