view tests/test-check-compat-strings.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.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 17 Sep 2020 14:51:45 +0530
parents 3c5bcb8ecf3a
children 73cd416a1653
line wrap: on
line source

Enable obsolescence to avoid the warning issue when obsmarkers are found

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

  $ $TESTDIR/testlib/check-compat-strings.sh "$TESTDIR/../hgext3rd/" "$RUNTESTDIR/.."