--- a/tests/test-evolve-content-divergent-first-changeset.t Fri Dec 20 14:08:37 2019 +0700
+++ b/tests/test-evolve-content-divergent-first-changeset.t Mon Nov 04 01:30:50 2019 +0530
@@ -1,6 +1,11 @@
$ . $TESTDIR/testlib/pythonpath.sh
- $ echo "[extensions]" >> $HGRCPATH
- $ echo "evolve=" >> $HGRCPATH
+ $ cat >> $HGRCPATH << EOF
+ > [extensions]
+ > evolve=
+ > [experimental]
+ > evolution.allowdivergence = True
+ > EOF
+
This test file tests the case of content-divergence resolution of changesets
that have the null revision as the parent.