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

r2958:ff3ea21a default
r4387:93a4e72b default
Show More
test-addremove
26 lines | 341 B | text/plain | TextLexer
Thomas Arendsen Hein
Added test for the currently broken addremove with the expected output.
r1623 #!/bin/sh
hg init rep
cd rep
mkdir dir
touch foo dir/bar
hg -v addremove
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 hg -v commit -m "add 1" -d "1000000 0"
Thomas Arendsen Hein
Added test for the currently broken addremove with the expected output.
r1623 cd dir/
touch ../foo_2 bar_2
hg -v addremove
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 hg -v commit -m "add 2" -d "1000000 0"
Vadim Gelfer
addremove: add -s/--similarity option...
r2958
cd ..
hg init sim
cd sim
echo a > a
echo a >> a
echo a >> a
echo c > c
hg commit -Ama
mv a b
rm c
echo d > d
hg addremove -s 0.5
hg commit -mb