tests/test-check-setup-manifest.t
author Martin von Zweigbergk <martinvonz@google.com>
Wed, 04 Mar 2020 15:21:32 -0800
changeset 5175 307bb57ff2ce
parent 2116 39d84b395343
permissions -rw-r--r--
tests: adapt now that Mercurial clears the merge state for empty wdir `hg evolve` forgot to clear the merge state when its attempt to commit resulted in no commit because the working copy had no changes. That resulted in test-evolve-issue5967.t showing a conflict state that shouldn't be there. The responsibility for clearing the merge state was moved into Mercurial in Mercurial in 6a34e438461b (commit: clear resolved mergestate even if working copy is clean, 2020-02-28), so the bug is now fixed in `hg evolve`, which impacts that test case. CORE-TEST-OUTPUT-UPDATE: 6a34e438461b

#require test-repo

  $ checkcm() {
  >   if ! (which check-manifest > /dev/null); then
  >     echo skipped: missing tool: check-manifest;
  >     exit 80;
  >   fi;
  > };
  $ checkcm
  $ cat << EOF >> $HGRCPATH
  > [experimental]
  > evolution=all
  > EOF

Run check manifest:

  $ cd $TESTDIR/..
  $ check-manifest
  lists of files in version control and sdist match