Mercurial > hg-stable

annotate hgext/__init__.py @ 46607:c19c662097e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: detect case when a merge decision overwrite previous data We now detect and record when a merge case required special logic (eg: thing that append during the merge, ambiguity leading to picking p1 data, etc) and we explicitly mark the result as superseding the previous data. This fixes the family of test we previously added. Differential Revision: https://phab.mercurial-scm.org/D9613
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 12 Dec 2020 19:35:08 +0100
parents 2372284d9457
children 6000f5b25c9b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
28450
155e3308289c hgext: officially turn 'hgext' into a namespace package
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1360
diff changeset
1 from __future__ import absolute_import
155e3308289c hgext: officially turn 'hgext' into a namespace package
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1360
diff changeset
2 import pkgutil
43076
2372284d9457 formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents: 28450
diff changeset
3
28450
155e3308289c hgext: officially turn 'hgext' into a namespace package
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1360
diff changeset
4 __path__ = pkgutil.extend_path(__path__, __name__)