##// 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:

r814:0902ffec merge default
r1885:c4d57726 default
Show More
test-flags
34 lines | 360 B | text/plain | TextLexer
Thomas Arendsen Hein
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
r800 #!/bin/sh -e
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
r412
Thomas Arendsen Hein
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags....
r491 umask 027
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
r412 mkdir test1
cd test1
hg init
touch a b
hg add a b
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg ci -m "added a b" -d "0 0"
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
r412
cd ..
mkdir test2
cd test2
hg init
mpm@selenic.com
Fix up tests for command name changes...
r440 hg pull ../test1
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
r412 hg co
chmod +x a
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg ci -m "chmod +x a" -d "0 0"
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
r412
cd ../test1
echo 123 >>a
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg ci -m "a updated" -d "0 0"
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
r412
mpm@selenic.com
Fix up tests for command name changes...
r440 hg pull ../test2
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
r412 hg heads
hg history
mpm@selenic.com
options: kill -d for debug...
r591 hg -v co -m
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
r412
ls -l ../test[12]/a > foo
cut -b 0-10 < foo