Mercurial > hg-stable
view tests/test-merge-subrepos.t @ 16107:a3dcc59054ca stable
pull: backout change to return code
This bit a number of people.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 10 Feb 2012 16:09:30 -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]