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

Test that share-clones use the cache in the original repository.

  $ . $TESTDIR/testlib/common.sh

  $ hg init share-base
  $ cd share-base/
  $ cat >> .hg/hgrc <<EOF
  > [extensions]
  > evolve=
  > share=
  > EOF
  $ hg debugbuilddag .+3:branchpoint+4*branchpoint+2
  $ cd ..
  $ hg --config extensions.share= share -U share-base share-client
  $ cd share-client
  $ hg debugupdatecache
  $ test -d .hg/cache
  [1]
  $ test -d ../share-base/.hg/cache