This instance will be upgraded to Heptapod 0.21.0rc3 on 2021-04-23 at 10:30 UTC+2 (a few minutes of down time)

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)
latest
Status Job ID Name Coverage
  Test
passed #111203
checks-py2

00:01:01

passed #111204
checks-py3

00:00:52

passed #111209
doc

00:00:17

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

00:05:58

passed #111206
tests-py2-pure

00:04:30

passed #111207
tests-py3-cext

00:04:38

passed #111208
tests-py3-pure

00:02:01