diff tests/test-exchange-obsmarkers-case-B2.t @ 3850:340cf6fbe9e9

evolve: create resolved cset on successors of current parents While resolving content-divergence, sometimes, the parent can be obsolete and have a successor. We should consider the successors of the parents instead of obsolete parents as that will do something like orphan+content-divergence resolution both at the same time which is powerful and results in a single stack while resolving content-divergence of stacks. The test changes demonstrates that we can now successfully evolve a content divergent stack.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 14 Jun 2018 01:39:33 +0530
parents e6bea259c227
children 98941c28f3e2
line wrap: on
line diff