Mercurial > evolve
view MANIFEST.in @ 4891:a9929dd36405 stable
pick: don't create any successors when there were no changes (issue6093)
For example, when a changeset that user is trying to pick was already grafted
or rebased (and no obsmarkers were created), pick will naturally say that
there's no changes to commit and will not create the new commit. In that case
it should not mark any changeset as a successor of the picked changeset,
because the actual file changes were already there before picking.
Technically, pick could (and did before this patch) mark the wdir commit as a
successor of picked changeset (may be useful in the most trivial cases when
e.g. wdir is a graft of the required change), but there are cases when the
picked change is introduced in an ancestor of wdir, or even in multiple
ancestors piece by piece. Pick definitely shouldn't be trying to guess
something this complicated, so with this patch it always marks the picked
change as pruned if it gave no changes to commit.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Mon, 07 Oct 2019 14:38:56 +0700 |
parents | a8525a2e0748 |
children | 60e2a6a11d62 |
line wrap: on
line source
exclude contrib exclude .hg-format-source recursive-exclude contrib * exclude hgext3rd/evolve/hack exclude .gitlab-ci.yml recursive-exclude hgext3rd/evolve/hack * exclude hgext3rd/evolve/legacy.py exclude Makefile exclude tests/test-drop.t exclude tests/test-inhibit.t exclude tests/test-oldconvert.t exclude docs/tutorial/.netlify include COPYING include docs/figures/hgview-example.png include docs/makefile include docs/*.py include docs/README include docs/*.rst include docs/static/*.svg include docs/tutorials/*.t include hgext3rd/__init__.py include hgext3rd/evolve/*.py include hgext3rd/evolve/thirdparty/*.py include hgext3rd/topic/*.py include hgext3rd/topic/README include MANIFEST.in include README include CHANGELOG include setup.py include tests/*.py include tests/*.sh include tests/testlib/*.sh include tests/*.t recursive-include docs/tutorial *.rst recursive-include docs/tutorial *.css include docs/tutorial/standalone.html recursive-include docs/tutorial *.js recursive-include docs/tutorial *.md recursive-include docs/tutorial *.py recursive-include docs/tutorial *.sh recursive-include docs/tutorial *.t prune debian recursive-include docs/figures *.svg