Mercurial > hg
view tests/test-merge-subrepos.t @ 17298:59c14bf5a48c stable
pushkey: do not exchange obsole markers if feature is disabled
This apply to both push and pull both when client or server.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Sat, 28 Jul 2012 13:33:06 +0200 |
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]