Mercurial > hg
view tests/test-gpg @ 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.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 26 Aug 2010 17:38:43 +0200 |
parents | 6e5e548452de |
children |
line wrap: on
line source
#!/bin/sh "$TESTDIR/hghave" gpg || exit 80 cat <<EOF >> $HGRCPATH [extensions] gpg= [gpg] cmd=gpg --no-permission-warning --no-secmem-warning --homedir $TESTDIR/gpg EOF hg init r cd r echo foo > foo hg ci -Amfoo echo '% no signatures' hg sigs echo '% hg sign 0' hg sign 0 echo '% hg sigs' hg sigs echo '% hg sigcheck 0' hg sigcheck 0