view tests/test-check-commit.t @ 5539:452651e69848 stable

evolvecmd: don't set `branchmerge=True` while resolving phase divergence

We are not going to create a merge commit, neither we are using two parents in
any way.

I am unable to see any reason why `branchmerge` should be passed as `True` here.

Passing branchmerge as True leads to side effect of having merge related commit
information stored in mergestate which leads us to having an active mergestate.

#require test-repo

Enable obsolescence to avoid the warning issue when obsmarker are found

  $ cat << EOF >> $HGRCPATH
  > [diff]
  > git = yes
  > [experimental]
  > evolution=all
  > EOF

Go back in the hg repo

  $ cd $TESTDIR/..

  $ for node in `hg log --rev 'not public() and ::. and not desc("# no-check-commit")' --template '{node|short}\n'`; do
  >    hg export $node | ${RUNTESTDIR}/../contrib/check-commit > ${TESTTMP}/check-commit.out
  >    if [ $? -ne 0 ]; then
  >        echo "Revision $node does not comply with rules"
  >        echo '------------------------------------------------------'
  >        cat ${TESTTMP}/check-commit.out
  >        echo
  >   fi
  > done