Mercurial > hg
view tests/test-merge-subrepos.t @ 25052:c4217a046b62
run-tests: record faildata using bytes instead of str
lines is already bytes, so this is just fixing a bug on python 3.
author | Augie Fackler <augie@google.com> |
---|---|
date | Tue, 14 Apr 2015 16:21:10 -0400 |
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]