Mercurial > hg
view tests/test-merge-subrepos.t @ 15661:20ae902c43ec stable
changelog: handle decoding of NULs in extra more carefully (issue3156)
Escaped NULs adjacent to [0-7] could be decoded as octal. This hits
about 0.24% of changesets with transplant, which stores binary nodes.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 16 Dec 2011 18:23:15 -0600 |
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]