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

r3853:c0b44915 default
r4387:93a4e72b default
Show More
test-commit-copy
14 lines | 192 B | text/plain | TextLexer
#!/bin/sh
hg init dir
cd dir
echo bleh > bar
hg add bar
hg ci -m 'add bar'
hg cp bar foo
echo >> bar
hg ci -m 'cp bar foo; change bar'
hg debugrename foo
hg debugindex .hg/store/data/bar.i