##// END OF EJS Templates
merge with upstream
merge with upstream

File last commit:

r2283:e506c143 default
r3320:fa59d676 merge default
Show More
test-flags
34 lines | 378 B | text/plain | TextLexer
#!/bin/sh -e
umask 027
mkdir test1
cd test1
hg init
touch a b
hg add a b
hg ci -m "added a b" -d "1000000 0"
cd ..
mkdir test2
cd test2
hg init
hg pull ../test1
hg co
chmod +x a
hg ci -m "chmod +x a" -d "1000000 0"
cd ../test1
echo 123 >>a
hg ci -m "a updated" -d "1000000 0"
hg pull ../test2
hg heads
hg history
hg -v merge
ls -l ../test[12]/a > foo
cut -b 1-10 < foo