evolve: make sure we always pick min revision to solve content-divergence

In current logic, to solve content-divergence between two csets
we pick one with minimum rev number as "divergent" and treat it as
local side (which is fixed); and other cset as "other" which may or may
not relocate.
For the information, later after this selection "divergent" and "other"
may or may not be swapped depending on the situation.

That said, this patch covers a missed case where it could select
a revision with maximum revision because it was just picking the
wdir parent.
8 jobs for topic/default/khanchi-resolution-order in 6 minutes and 9 seconds (queued for 1 minute and 57 seconds)
Status Name Job ID Coverage
  Test
passed checks-py2 #111203

00:01:01

passed checks-py3 #111204

00:00:52

passed doc #111209

00:00:17

manual pytype #111202
allowed to fail manual
passed tests-py2-cext #111205

00:05:58

passed tests-py2-pure #111206

00:04:30

passed tests-py3-cext #111207

00:04:38

passed tests-py3-pure #111208

00:02:01