Mercurial > hg
view tests/test-merge-subrepos.t @ 22385:95032d2cf96f
fedora: remove sample.hgrc from shipped files
sample.hgrc was long obsolete and was removed in 63ed188e3fc7.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Tue, 02 Sep 2014 14:10:08 -0700 |
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]