evolve: rename some variable ahead of time
A refactoring of the content divergence resolution in on its way. use a
distinctive name for some variable early to make the change easier to read
later.
# setup config and various utility to test new heads checks on push.$TESTDIR/testlib/common.shcat>>$HGRCPATH<<EOF[ui]# simpler log outputlogtemplate ="{node|short} ({phase}): {desc}\n"[phases]# non publishing serverpublish=False[extensions]# we need to strip some changeset for some test casesstrip=evolve=EOFsetuprepos(){echocreatingbasicserverandclientrepohginitservercdservermkcommitroothgphase--public.mkcommitA0cd..hgcloneserverclient}