Mercurial > evolve
annotate MANIFEST.in @ 6224:17ffdea0edbb stable
evolve: look for split successors of the correct ancestor (issue6648)
Consider two changesets, 1 and 2. 1 is split into two new changesets and 2 is
pruned. If we stand on 2 and call hg evolve, _singlesuccessor() will traverse
ancestors of wdp in search of a changeset with successors to update to (it will
be 1, which was split). In case of a split, select_split_successor() gets
control. The issue is this function didn't traverse ancestors, and instead
tried to look up successors of the original changeset (i.e. 2 in our case,
which was pruned).
We can make select_split_successor() aware of _singlesuccessor() logic by using
the changeset that actually has successors without traversing ancestors again.
It's done by storing that changeset in MultipleSuccessorsError exception.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Thu, 21 Apr 2022 22:19:27 +0400 |
parents | fa2fc0cad459 |
children | 7f95546f584e dd518437d4e0 |
rev | line source |
---|---|
5130
40ae7c5b3b17
packaging: handle docs in a separate block in MANIFEST.in
Anton Shestakov <av6@dwimlabs.net>
parents:
5129
diff
changeset
|
1 include CHANGELOG |
1770
be85d7ce8536
Manifest.in: sort entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1062
diff
changeset
|
2 include COPYING |
3033
13751fef5e66
topics: move README-topic as hgext3rd/topic/README
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3032
diff
changeset
|
3 include hgext3rd/topic/README |
1775
a37ef09e27b1
Manifest.in: include Manifest.in
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1774
diff
changeset
|
4 include MANIFEST.in |
5404
9e0f91cb5242
evolve: the rest of b3e178f3e31f
Anton Shestakov <av6@dwimlabs.net>
parents:
5393
diff
changeset
|
5 include README.rst |
524
ba0a3d0f942f
pkg: add proper MANIFEST.in
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
6 include setup.py |
5770
7d5d9301c244
manifest: include all .py files from hgext3rd
Anton Shestakov <av6@dwimlabs.net>
parents:
5404
diff
changeset
|
7 recursive-include hgext3rd *.py |
5246
57ae9af43e6b
manifest: just include all .py .sh and .t files from tests/ recursively
Anton Shestakov <av6@dwimlabs.net>
parents:
5245
diff
changeset
|
8 recursive-include tests *.py *.sh *.t |
5130
40ae7c5b3b17
packaging: handle docs in a separate block in MANIFEST.in
Anton Shestakov <av6@dwimlabs.net>
parents:
5129
diff
changeset
|
9 |
40ae7c5b3b17
packaging: handle docs in a separate block in MANIFEST.in
Anton Shestakov <av6@dwimlabs.net>
parents:
5129
diff
changeset
|
10 include docs/makefile |
40ae7c5b3b17
packaging: handle docs in a separate block in MANIFEST.in
Anton Shestakov <av6@dwimlabs.net>
parents:
5129
diff
changeset
|
11 include docs/*.py |
40ae7c5b3b17
packaging: handle docs in a separate block in MANIFEST.in
Anton Shestakov <av6@dwimlabs.net>
parents:
5129
diff
changeset
|
12 include docs/README |
40ae7c5b3b17
packaging: handle docs in a separate block in MANIFEST.in
Anton Shestakov <av6@dwimlabs.net>
parents:
5129
diff
changeset
|
13 include docs/*.rst |
40ae7c5b3b17
packaging: handle docs in a separate block in MANIFEST.in
Anton Shestakov <av6@dwimlabs.net>
parents:
5129
diff
changeset
|
14 include docs/static/*.svg |
40ae7c5b3b17
packaging: handle docs in a separate block in MANIFEST.in
Anton Shestakov <av6@dwimlabs.net>
parents:
5129
diff
changeset
|
15 include docs/tutorials/*.t |
3383
733e01473ec2
packaging: update MANIFEST.in to include new tutorial files
Boris Feld <boris.feld@octobus.net>
parents:
3033
diff
changeset
|
16 include docs/tutorial/standalone.html |
5129
b7048f3e1847
packaging: simplify inclusion of docs in MANIFEST.in
Anton Shestakov <av6@dwimlabs.net>
parents:
5128
diff
changeset
|
17 recursive-include docs/figures *.svg *.png |
b7048f3e1847
packaging: simplify inclusion of docs in MANIFEST.in
Anton Shestakov <av6@dwimlabs.net>
parents:
5128
diff
changeset
|
18 recursive-include docs/tutorial *.css *.js *.md *.py *.rst *.sh *.t |
5245
3528fb011417
manifest: make sure exclusions and prunes are last, because order matters
Anton Shestakov <av6@dwimlabs.net>
parents:
5130
diff
changeset
|
19 |
3528fb011417
manifest: make sure exclusions and prunes are last, because order matters
Anton Shestakov <av6@dwimlabs.net>
parents:
5130
diff
changeset
|
20 exclude docs/tutorial/.netlify |
3528fb011417
manifest: make sure exclusions and prunes are last, because order matters
Anton Shestakov <av6@dwimlabs.net>
parents:
5130
diff
changeset
|
21 exclude .gitlab-ci.yml |
5771
fa2fc0cad459
manifest: use a regular relative path for excluding legacy.py
Anton Shestakov <av6@dwimlabs.net>
parents:
5770
diff
changeset
|
22 exclude hgext3rd/evolve/legacy.py |
5245
3528fb011417
manifest: make sure exclusions and prunes are last, because order matters
Anton Shestakov <av6@dwimlabs.net>
parents:
5130
diff
changeset
|
23 exclude .hg-format-source |
3528fb011417
manifest: make sure exclusions and prunes are last, because order matters
Anton Shestakov <av6@dwimlabs.net>
parents:
5130
diff
changeset
|
24 exclude Makefile |
3528fb011417
manifest: make sure exclusions and prunes are last, because order matters
Anton Shestakov <av6@dwimlabs.net>
parents:
5130
diff
changeset
|
25 exclude tests/test-drop.t |
3528fb011417
manifest: make sure exclusions and prunes are last, because order matters
Anton Shestakov <av6@dwimlabs.net>
parents:
5130
diff
changeset
|
26 exclude tests/test-oldconvert.t |
3528fb011417
manifest: make sure exclusions and prunes are last, because order matters
Anton Shestakov <av6@dwimlabs.net>
parents:
5130
diff
changeset
|
27 |
3528fb011417
manifest: make sure exclusions and prunes are last, because order matters
Anton Shestakov <av6@dwimlabs.net>
parents:
5130
diff
changeset
|
28 prune contrib |
3528fb011417
manifest: make sure exclusions and prunes are last, because order matters
Anton Shestakov <av6@dwimlabs.net>
parents:
5130
diff
changeset
|
29 prune debian |
3528fb011417
manifest: make sure exclusions and prunes are last, because order matters
Anton Shestakov <av6@dwimlabs.net>
parents:
5130
diff
changeset
|
30 prune .gitlab |
3528fb011417
manifest: make sure exclusions and prunes are last, because order matters
Anton Shestakov <av6@dwimlabs.net>
parents:
5130
diff
changeset
|
31 prune hgext3rd/evolve/hack |