Mercurial > hg
view tests/test-merge-subrepos.t @ 23337:3a8a763f4197
revlog: add a method to get missing revs incrementally
This will turn out to be useful for discovery.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Sun, 16 Nov 2014 00:39:48 -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]