Mercurial > hg
diff tests/test-merge-subrepos.t @ 13437:6169493ac3f9 stable
Do not allow merging with uncommitted changes in a subrepo
author | Oleg Stepanov <oleg.stepanov@jetbrains.com> |
---|---|
date | Wed, 16 Feb 2011 08:56:11 -0800 |
parents | |
children | 0f64af33fb63 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-merge-subrepos.t Wed Feb 16 08:56:11 2011 -0800 @@ -0,0 +1,25 @@ + $ 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]