evolve: change in a test which demonstrate divergence resolution can break
This patch just add "--any" flag to "hg evolve --content-divergent" in
a test and changed output reflect that there is something which is not
handled correctly.
After looking into code I found that it is because of using a evolvestate
value which is not updated i.e evolvestate['divergent']
Next patch will fix this problem.
#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