hgext3rd/__init__.py
author Pulkit Goyal <7895pulkit@gmail.com>
Thu, 07 Jun 2018 18:18:10 +0530
changeset 3809 f06ff8fee2f6
parent 2020 143c8e4dc22d
permissions -rw-r--r--
evolvestate: store info about relocation while resolving content-divergence While resolving content-divergence when they are on different parents, we relocate one of the node to parent of another one and this can lead to conflicts sometimes. So we need to store information about that state in evolvestate so that we can use that when user does `hg evolve --continue` or `--stop` or `--abort`. Now that we make sure, we store the new other node in evolvestate, we fix the behavior of handling the relocated commit and merge the right changesets.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1806
9f42f819267b evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     1
# name space package to host third party extensions
1901
85390446f8c1 packaging: fix setup.py and install as hgext3rd.topic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     2
from __future__ import absolute_import
85390446f8c1 packaging: fix setup.py and install as hgext3rd.topic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     3
import pkgutil
85390446f8c1 packaging: fix setup.py and install as hgext3rd.topic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     4
__path__ = pkgutil.extend_path(__path__, __name__)