evolve: fix content-divergence resolution when p1 is null (issue6201)

Before this fix, in cases like in the added test, the revision number -1 of the
parent was misinterpreted to mean the tipmost revision instead of the null
revision, causing the content-divergence resolution to fail.
5 jobs for topic/stable/issue6201 in 4 minutes and 18 seconds (queued for 2 seconds)