view tests/check-gendoc @ 38498:d4be8ea8f22d

merge: add a 'keepconflictparent' argument to graft

Before this change, `merge.graft` was always dropping the "grafted" changeset
from the parent. This is impractical in case of conflict as the second parent
can be useful to help with conflict resolution.

We add a new boolean parameter to control this behavior. This will make using
`merge.graft` directly in shelve practicable.

Differential Revision: https://phab.mercurial-scm.org/D3692

#!/bin/sh
HGENCODING=UTF-8
export HGENCODING

echo ".. -*- coding: utf-8 -*-" > gendoc.txt
echo "" >> gendoc.txt
LANGUAGE=$1 python "$TESTDIR/../doc/gendoc.py" >> gendoc.txt 2> /dev/null || exit

echo "checking for parse errors"
python "$TESTDIR/../doc/docchecker" gendoc.txt
python "$TESTDIR/../doc/runrst" html gendoc.txt /dev/null