test-empty-group
49 lines
| 787 B
| text/plain
|
TextLexer
/ tests / test-empty-group
Benoit Boissinot
|
r2339 | #!/bin/sh | ||
# | ||||
Thomas Arendsen Hein
|
r4659 | # A B | ||
# | ||||
# 3 4 3 | ||||
# |\/| |\ | ||||
# |/\| | \ | ||||
# 1 2 1 2 | ||||
# \ / \ / | ||||
Benoit Boissinot
|
r2339 | # 0 0 | ||
# | ||||
# if the result of the merge of 1 and 2 | ||||
# is the same in 3 and 4, no new manifest | ||||
# will be created and the manifest group | ||||
# will be empty during the pull | ||||
# | ||||
# (plus we test a failure where outgoing | ||||
# wrongly reported the number of csets) | ||||
# | ||||
hg init a | ||||
cd a | ||||
touch init | ||||
Martin Geisler
|
r12156 | hg ci -A -m 0 | ||
Benoit Boissinot
|
r2339 | touch x y | ||
Martin Geisler
|
r12156 | hg ci -A -m 1 | ||
Benoit Boissinot
|
r2339 | hg update 0 | ||
touch x y | ||||
Martin Geisler
|
r12156 | hg ci -A -m 2 | ||
Benoit Boissinot
|
r2339 | hg merge 1 | ||
Martin Geisler
|
r12156 | hg ci -A -m m1 | ||
Benoit Boissinot
|
r2339 | #hg log | ||
Benoit Boissinot
|
r3853 | #hg debugindex .hg/store/00manifest.i | ||
Benoit Boissinot
|
r2339 | hg update -C 1 | ||
hg merge 2 | ||||
Martin Geisler
|
r12156 | hg ci -A -m m2 | ||
Benoit Boissinot
|
r2339 | #hg log | ||
Benoit Boissinot
|
r3853 | #hg debugindex .hg/store/00manifest.i | ||
Benoit Boissinot
|
r2339 | |||
cd .. | ||||
hg clone -r 3 a b | ||||
hg clone -r 4 a c | ||||
hg -R a outgoing b | ||||
hg -R a outgoing c | ||||
hg -R b outgoing c | ||||
hg -R c outgoing b | ||||
hg -R b pull a | ||||
hg -R c pull a | ||||