Mercurial > hg-stable
view tests/check-gendoc @ 45874:781b09790633
tests: show that interactive shelve can leave the repo with a merge state
If part of a file is shelved (as we already do in a test), there will
be an unfinished merge state left after `hg shelve` finishes. There
should never be a merge conflict and there should never be a reason
that the user would like to re-resolve conflicts, so we should clear
that state (see next patch).
Differential Revision: https://phab.mercurial-scm.org/D9334
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 16 Nov 2020 22:38:36 -0800 |
parents | 69c99898a48f |
children |
line wrap: on
line source
#!/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