##// END OF EJS Templates
run-tests.py: pass -L/--label to simplemerge...
run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.

File last commit:

r3199:096f1c73 default
r4387:93a4e72b default
Show More
test-remove
32 lines | 397 B | text/plain | TextLexer
#!/bin/sh
hg init a
cd a
echo a > foo
hg rm foo
hg add foo
hg commit -m 1 -d "1000000 0"
hg remove
rm foo
hg remove foo
hg revert --all
rm foo
hg remove --after
hg commit -m 2 -d "1000000 0"
hg export --nodates 0
hg export --nodates 1
hg log -p -r 0
hg log -p -r 1
echo a > a
hg add a
hg rm a
hg rm -f a
echo b > b
hg ci -A -m 3 -d "1000001 0"
echo c >> b
hg rm b
hg rm -f b
cd ..
hg clone a b