view tests/test-convert-svn-encoding @ 12045:1e8c7999af86

Fix merge-tools.checkconflicts

re.match only looks at the beginning of the merged file, and without
re.MULTILINE the file had to end with ">>>>>>> something".

Now conflict markers inside the file are found, too.

#!/bin/sh

"$TESTDIR/hghave" svn svn-bindings || exit 80

echo "[extensions]" >> $HGRCPATH
echo "convert = " >> $HGRCPATH

svnadmin create svn-repo
cat "$TESTDIR/svn/encoding.svndump" | svnadmin load svn-repo > /dev/null

echo '% convert while testing all possible outputs'
hg --debug convert svn-repo A-hg > /dev/null
cd A-hg
hg up
echo '% check tags are in UTF-8'
python -c "print '\n'.join([('%r' % l) for l in file('.hgtags', 'rb').readlines()])"
cd ..