##// END OF EJS Templates
rebase: avoid redundant merges (issue1301)
rebase: avoid redundant merges (issue1301)

File last commit:

r3923:27230c29 0.9.3 default
r7278:45495d78 default
Show More
test-push-warn
62 lines | 857 B | 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 $?
Thomas Arendsen Hein
Fix hg push and hg push -r sometimes creating new heads without --force....
r2021 exit 0