Improvement to
14ce129cfcd: Use try/except and pass filename on errors
Without the second part, the error message would be
abort: Is a directory
instead of
abort: Is a directory: /home/user/.cvspass
#!/bin/sh
mkdir t
cd t
hg init
mkdir src
echo a > src/a.c
hg ci -Ama -d "10000000 0"
hg mv src source
hg ci -Ammove -d "1000000 0"
hg co -C 0
echo new > src/a.c
echo compiled > src/a.o
hg ci -mupdate -d "1000000 0"
hg st
hg merge
hg st