##// END OF EJS Templates
add benoit's test for issue148.
add benoit's test for issue148.

File last commit:

r1933:7544700f default
r2000:6f6e210b default
Show More
test-up-local-change
57 lines | 971 B | text/plain | TextLexer
/ tests / test-up-local-change
Thomas Arendsen Hein
Remove bashisms and use /bin/sh instead of /bin/bash....
r544 #!/bin/sh
mpm@selenic.com
Add a simple testing framework...
r331
Thomas Arendsen Hein
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
r800 set -e
mpm@selenic.com
Add a simple testing framework...
r331 mkdir r1
cd r1
hg init
echo a > a
hg addremove
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
Add a simple testing framework...
r331
mpm@selenic.com
[PATCH] add clone command...
r485 hg clone . ../r2
cd ../r2
mpm@selenic.com
Add a simple testing framework...
r331 hg up
echo abc > a
TK Soh
test fixes for Solaris 2.6...
r949 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
mpm@selenic.com
Add a simple testing framework...
r331
cd ../r1
echo b > b
echo a2 > a
hg addremove
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
Add a simple testing framework...
r331
cd ../r2
hg -q pull ../r1
hg status
Benoit Boissinot
abort when using 'update -m' and this is not a merge...
r1674 hg parents
mpm@selenic.com
options: kill -d for debug...
r591 hg --debug up
Benoit Boissinot
abort when using 'update -m' and this is not a merge...
r1674 hg parents
hg --debug up 0
hg parents
Benoit Boissinot
abort when merging two heads and repository has local changes
r1581 hg --debug up -m || echo failed
Benoit Boissinot
abort when using 'update -m' and this is not a merge...
r1674 hg parents
hg --debug up
mpm@selenic.com
Add a simple testing framework...
r331 hg parents
hg -v history
TK Soh
test fixes for Solaris 2.6...
r949 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
mpm@selenic.com
Add a simple testing framework...
r331
Benoit Boissinot
abort when using 'update -m' and this is not a merge...
r1674 # create a second head
cd ../r1
hg up 0
echo b2 > b
echo a3 > a
hg addremove
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"
Benoit Boissinot
abort when using 'update -m' and this is not a merge...
r1674
cd ../r2
hg -q pull ../r1
hg status
hg parents
hg --debug up || echo failed
hg --debug up -m || echo failed
hg --debug up -f -m
hg parents
hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"