Mercurial > hg
view tests/test-check-commit-hg.t @ 27267:d6859d86a5d5
merge.graft: add option to keep second parent
Currently merge.graft re-writes the dirstate so only a single
parent is kept. For some cases, like evolving a merge commit,
this behaviour is not desired. More specifically, this is
needed to fix issue4389.
author | Andrew Halberstadt <ahalberstadt@mozilla.com> |
---|---|
date | Thu, 03 Dec 2015 23:01:59 -0500 |
parents | 80a37f706011 |
children |
line wrap: on
line source
#require test-repo Enable obsolescence to avoid the warning issue when obsmarker are found $ cat >> $HGRCPATH << EOF > [experimental] > evolution=createmarkers > EOF Go back in the hg repo $ cd $TESTDIR/.. $ for node in `hg log --rev 'draft() and ::.' --template '{node|short}\n'`; do > hg export $node | contrib/check-commit > ${TESTTMP}/check-commit.out > if [ $? -ne 0 ]; then > echo "Revision $node does not comply to rules" > echo '------------------------------------------------------' > cat ${TESTTMP}/check-commit.out > echo > fi > done