Mercurial > hg
view tests/test-merge-subrepos.t @ 19734:e61c6138fa33
context: move evolution functions from changectx to basectx
This is just a code move and corrects an overlook from my previous patch series
that assumed only a changectx would want this functionality.
author | Sean Farley <sean.michael.farley@gmail.com> |
---|---|
date | Tue, 17 Sep 2013 23:34:57 -0500 |
parents | 6169493ac3f9 |
children | 0f64af33fb63 |
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: outstanding uncommitted changes in subrepository 'subrepo' [255]