Mercurial > evolve
annotate hgext3rd/__init__.py @ 4721:b69497b23d31
touch: make sure merge commits include files from p1 and p2
Otherwise touching a merge commit makes it lose all changes.
This fix populates `updates` argument of rewriteutil.rewrite() with parent
changesets. That argument is normally used for folding multiple changesets, but
in this case it's simply used to include files from p1 and p2. Usually,
rewrite() works fine using ctx.files(), but that function can return an empty
list when ctx is a merge commit.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Wed, 10 Jul 2019 18:16:38 +0800 |
parents | 143c8e4dc22d |
children |
rev | line source |
---|---|
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__) |