hgext3rd/__init__.py
author Pulkit Goyal <7895pulkit@gmail.com>
Thu, 07 Jun 2018 20:27:03 +0530
changeset 3807 03ccdc753582
parent 2020 143c8e4dc22d
permissions -rw-r--r--
evolve: commit the transaction if conflicts occur while merging content-div Yes, let's commit the transaction in case conflicts occur. Yes, this is what unshelve does and this is one of the reasons we don't like unshelve. Previous patches added support for resolving content-divergence when they are on different parents with parent of one being the gca. In such cases, we relocate one of the divergent commit to the parent of another one. All the relocation stuff and merging divergent changeset stuff happens in a single transaction, so if there are conflicts while merging, we abort and the transaction rollsback and our relocated commit is not applied after abort. We don't want to process the relocation because that can lead to conflicts and we will have dirty wdir because of resolving conflicts. So, we commit the transaction when merging results in conflicts to make sure if relocation happened, we commit that. This fixes the absence of relocation commit found in previous patch and uncover a new bug about handling of relocated commit. Upcoming patch will fix it.
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__)