##// END OF EJS Templates
test-extension: update test output to match a4f6e4427b65
test-extension: update test output to match a4f6e4427b65

File last commit:

r9479:f3569d95 default
r9481:829f5c2a default
Show More
test-push-warn
126 lines | 2.0 KiB | text/plain | TextLexer
mpm@selenic.com
Warn on pushing unsynced repo or adding new heads...
r816 #!/bin/sh
mkdir a
cd a
hg init
echo foo > t1
hg add t1
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 hg commit -m "1" -d "1000000 0"
mpm@selenic.com
Warn on pushing unsynced repo or adding new heads...
r816
cd ..
hg clone a b
cd a
echo foo > t2
hg add t2
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 hg commit -m "2" -d "1000000 0"
mpm@selenic.com
Warn on pushing unsynced repo or adding new heads...
r816
cd ../b
echo foo > t3
hg add t3
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 hg commit -m "3" -d "1000000 0"
mpm@selenic.com
Warn on pushing unsynced repo or adding new heads...
r816
hg push ../a
hg pull ../a
hg push ../a
Vadim Gelfer
deprecate 'update -m'. use 'merge' instead.
r2283 hg merge
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 hg commit -m "4" -d "1000000 0"
mpm@selenic.com
Warn on pushing unsynced repo or adding new heads...
r816 hg push ../a
Thomas Arendsen Hein
Fix hg push and hg push -r sometimes creating new heads without --force....
r2021 cd ..
hg init c
cd c
for i in 0 1 2; do
echo $i >> foo
hg ci -Am $i -d "1000000 0"
done
cd ..
hg clone c d
cd d
for i in 0 1; do
hg co -C $i
echo d-$i >> foo
hg ci -m d-$i -d "1000000 0"
done
Vadim Gelfer
deprecate 'update -m'. use 'merge' instead.
r2283 HGMERGE=true hg merge 3
Thomas Arendsen Hein
Fix hg push and hg push -r sometimes creating new heads without --force....
r2021 hg ci -m c-d -d "1000000 0"
Thomas Arendsen Hein
Don't report an error when closing heads during local push (issue387)
r3803 hg push ../c; echo $?
hg push -r 2 ../c; echo $?
hg push -r 3 ../c; echo $?
hg push -r 3 -r 4 ../c; echo $?
hg push -f -r 3 -r 4 ../c; echo $?
hg push -r 5 ../c; echo $?
Thomas Arendsen Hein
Fix hg push and hg push -r sometimes creating new heads without --force....
r2021
Benoit Boissinot
fix calculation of new heads added during push with -r...
r3923 # issue 450
hg init ../e
hg push -r 0 ../e ; echo $?
hg push -r 1 ../e ; echo $?
Sune Foldager
tests: add tests for new pre-push logic (issue736)...
r8565 cd ..
# issue 736
echo % issue 736
hg init f
cd f
hg -q branch a
echo 0 > foo
hg -q ci -d "1000000 0" -Am 0
echo 1 > foo
hg -q ci -d "1000000 0" -m 1
hg -q up 0
echo 2 > foo
hg -q ci -d "1000000 0" -m 2
hg -q up 0
hg -q branch b
echo 3 > foo
hg -q ci -d "1000000 0" -m 3
cd ..
hg -q clone f g
cd g
echo % push on existing branch and new branch
hg -q up 1
echo 4 > foo
hg -q ci -d "1000000 0" -m 4
hg -q up 0
echo 5 > foo
hg -q branch c
hg -q ci -d "1000000 0" -m 5
hg push -r 4 -r 5 ../f; echo $?
echo % fail on multiple head push
hg -q up 1
echo 6 > foo
hg -q ci -d "1000000 0" -m 6
hg push -r 4 -r 6 ../f; echo $?
echo % push replacement head on existing branches
hg -q up 3
echo 7 > foo
hg -q ci -d "1000000 0" -m 7
hg push -r 6 -r 7 ../f; echo $?
echo % merge of branch a to other branch b followed by unrelated push on branch a
hg -q up 6
HGMERGE=true hg -q merge 7
hg -q ci -d "1000000 0" -m 8
hg -q up 7
echo 9 > foo
hg -q ci -d "1000000 0" -m 9
hg push -r 8 ../f; echo $?
hg push -r 9 ../f; echo $?
echo % cheating the counting algorithm
hg -q up 8
HGMERGE=true hg -q merge 2
hg -q ci -d "1000000 0" -m 10
hg -q up 1
echo 11 > foo
hg -q ci -d "1000000 0" -m 11
hg push -r 10 -r 11 ../f; echo $?
Thomas Arendsen Hein
Fix hg push and hg push -r sometimes creating new heads without --force....
r2021 exit 0