Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
13436:b391c0c9be61 | 13437:6169493ac3f9 |
---|---|
1 $ hg init | |
2 | |
3 $ echo a > a | |
4 $ hg ci -qAm 'add a' | |
5 | |
6 $ hg init subrepo | |
7 $ echo 'subrepo = http://example.net/libfoo' > .hgsub | |
8 $ hg ci -qAm 'added subrepo' | |
9 | |
10 $ hg up -qC 0 | |
11 $ echo ax > a | |
12 $ hg ci -m 'changed a' | |
13 created new head | |
14 | |
15 $ hg up -qC 1 | |
16 $ cd subrepo | |
17 $ echo b > b | |
18 $ hg add b | |
19 $ cd .. | |
20 | |
21 Should fail, since there are added files to subrepo: | |
22 | |
23 $ hg merge | |
24 abort: outstanding uncommitted changes in subrepository 'subrepo' | |
25 [255] |