##// END OF EJS Templates
run merge program in repo root....
run merge program in repo root. before, merge program was run in user current directory. Well defined location is better for scripts. no more need to pass HG_ROOT to merge program now.

File last commit:

r1308:2073e5a7 default
r1885:c4d57726 default
Show More
test-rawcommit1
33 lines | 616 B | text/plain | TextLexer
Thomas Arendsen Hein
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
r800 #!/bin/sh
mpm@selenic.com
options: kill -d for debug...
r591 hg --debug init
mpm@selenic.com
Add rawcommit tests...
r444 echo this is a1 > a
mpm@selenic.com
options: kill -d for debug...
r591 hg add a
Thomas Arendsen Hein
Cleanup of tabs and trailing spaces.
r1308 hg commit -m0 -d "0 0"
mpm@selenic.com
Add rawcommit tests...
r444 echo this is b1 > b
mpm@selenic.com
options: kill -d for debug...
r591 hg add b
Thomas Arendsen Hein
Cleanup of tabs and trailing spaces.
r1308 hg commit -m1 -d "0 0"
mpm@selenic.com
options: kill -d for debug...
r591 hg manifest 1
mpm@selenic.com
Add rawcommit tests...
r444 echo this is c1 > c
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg rawcommit -p 1 -d "0 0" -m2 c
mpm@selenic.com
options: kill -d for debug...
r591 hg manifest 2
hg parents
mpm@selenic.com
Add rawcommit tests...
r444 rm b
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg rawcommit -p 2 -d "0 0" -m3 b
mpm@selenic.com
options: kill -d for debug...
r591 hg manifest 3
hg parents
mpm@selenic.com
Add rawcommit tests...
r444 echo this is a22 > a
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg rawcommit -p 3 -d "0 0" -m4 a
mpm@selenic.com
options: kill -d for debug...
r591 hg manifest 4
hg parents
mpm@selenic.com
Add rawcommit tests...
r444 echo this is c22 > c
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg rawcommit -p 1 -d "0 0" -m5 c
mpm@selenic.com
options: kill -d for debug...
r591 hg manifest 5
hg parents
mpm@selenic.com
Add rawcommit tests...
r444 # merge, but no files changed
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg rawcommit -p 4 -p 5 -d "0 0" -m6
mpm@selenic.com
options: kill -d for debug...
r591 hg manifest 6
hg parents
mpm@selenic.com
Add rawcommit tests...
r444 # no changes what-so-ever
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg rawcommit -p 6 -d "0 0" -m7
mpm@selenic.com
options: kill -d for debug...
r591 hg manifest 7
hg parents