hgext3rd/__init__.py
author Pulkit Goyal <7895pulkit@gmail.com>
Thu, 14 Jun 2018 01:39:33 +0530
changeset 3850 340cf6fbe9e9
parent 2020 143c8e4dc22d
permissions -rw-r--r--
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.

# name space package to host third party extensions
from __future__ import absolute_import
import pkgutil
__path__ = pkgutil.extend_path(__path__, __name__)