##// END OF EJS Templates
merge.
merge.

File last commit:

r2935:1c66aad2 default
r2952:6ba3409f merge default
Show More
README
33 lines | 1005 B | text/plain | TextLexer
mpm@selenic.com
Add a simple testing framework...
r331 A simple testing framework
mpm@selenic.com
testing fixups...
r332 To run the tests, do:
cd tests/
Stephen Darnell
Delete the shell version of run-tests...
r2207 python run-tests.py
mpm@selenic.com
testing fixups...
r332
mpm@selenic.com
Add a simple testing framework...
r331 This finds all scripts in the test directory named test-* and executes
them. The scripts can be either shell scripts or Python. Each test is
run in a temporary directory that is removed when the test is complete.
A test-<x> succeeds if the script returns success and its output
matches test-<x>.out. If the new output doesn't match, it is stored in
test-<x>.err.
There are some tricky points here that you should be aware of when
writing tests:
Vadim Gelfer
deprecate 'update -m'. use 'merge' instead.
r2283 - hg commit and hg merge want user interaction
mpm@selenic.com
Add a simple testing framework...
r331
Andrew Thompson
Change all references to -t --text commit message to -m and --message.
r761 for commit use -m "text"
Vadim Gelfer
deprecate 'update -m'. use 'merge' instead.
r2283 for hg merge, set HGMERGE to something noninteractive (like true or merge)
mpm@selenic.com
Add a simple testing framework...
r331
- changeset hashes will change based on user and date which make
things like hg history output change
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 use commit -m "test" -u test -d "1000000 0"
mpm@selenic.com
Add a simple testing framework...
r331
- diff will show the current time
Brendan Cully
sed portability fixes
r2935 use hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
to strip dates