##// END OF EJS Templates
issue1577: fix broken test by assuming less about CVS output....
issue1577: fix broken test by assuming less about CVS output. Specifically, output of "cvs ci" varies unpredictably across CVS versions, so any test that includes the output of "cvs ci" is doomed to fail some of the time. This fixes that by discarding the output of "cvs ci".

File last commit:

r4659:7a7d4937 default
r8081:6c3b8132 default
Show More
test-empty-group
49 lines | 862 B | text/plain | TextLexer
Benoit Boissinot
document and fix findincoming...
r2339 #!/bin/sh
#
Thomas Arendsen Hein
Kill trailing spaces
r4659 # A B
#
# 3 4 3
# |\/| |\
# |/\| | \
# 1 2 1 2
# \ / \ /
Benoit Boissinot
document and fix findincoming...
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
hg ci -A -m 0 -d "1000000 0"
touch x y
hg ci -A -m 1 -d "1000000 0"
hg update 0
touch x y
hg ci -A -m 2 -d "1000000 0"
hg merge 1
hg ci -A -m m1 -d "1000000 0"
#hg log
Benoit Boissinot
switch to the .hg/store layout, fix the tests
r3853 #hg debugindex .hg/store/00manifest.i
Benoit Boissinot
document and fix findincoming...
r2339 hg update -C 1
hg merge 2
hg ci -A -m m2 -d "1000000 0"
#hg log
Benoit Boissinot
switch to the .hg/store layout, fix the tests
r3853 #hg debugindex .hg/store/00manifest.i
Benoit Boissinot
document and fix findincoming...
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