annotate MANIFEST.in @ 5550:95d00d58885f

evolve: rely on resolutionparent when relocating divergent csets As discussed with Pierre-Yves the current behavior of resolving content-divergence when parent changes: 1) First we decide the resolution parent (the parent where resolution cset will be based on) 2) Relocate both the divergent csets to the resolution parent (if a cset is already on resolution parent, nothing to do for it) 3) Perform 3-way merge to create the resolution cset of content-div This patch makes sure that we rely on that decided resolution parent, when relocating divergent csets to the parent where the resolution cset will be based on.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Wed, 05 Aug 2020 15:04:48 +0530
parents 9e0f91cb5242
children 7d5d9301c244
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
5246
57ae9af43e6b manifest: just include all .py .sh and .t files from tests/ recursively
Anton Shestakov <av6@dwimlabs.net>
parents: 5245
diff changeset
7 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
8
40ae7c5b3b17 packaging: handle docs in a separate block in MANIFEST.in
Anton Shestakov <av6@dwimlabs.net>
parents: 5129
diff changeset
9 include docs/makefile
40ae7c5b3b17 packaging: handle docs in a separate block in MANIFEST.in
Anton Shestakov <av6@dwimlabs.net>
parents: 5129
diff changeset
10 include docs/*.py
40ae7c5b3b17 packaging: handle docs in a separate block in MANIFEST.in
Anton Shestakov <av6@dwimlabs.net>
parents: 5129
diff changeset
11 include docs/README
40ae7c5b3b17 packaging: handle docs in a separate block in MANIFEST.in
Anton Shestakov <av6@dwimlabs.net>
parents: 5129
diff changeset
12 include docs/*.rst
40ae7c5b3b17 packaging: handle docs in a separate block in MANIFEST.in
Anton Shestakov <av6@dwimlabs.net>
parents: 5129
diff changeset
13 include docs/static/*.svg
40ae7c5b3b17 packaging: handle docs in a separate block in MANIFEST.in
Anton Shestakov <av6@dwimlabs.net>
parents: 5129
diff changeset
14 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
15 include docs/tutorial/standalone.html
5129
b7048f3e1847 packaging: simplify inclusion of docs in MANIFEST.in
Anton Shestakov <av6@dwimlabs.net>
parents: 5128
diff changeset
16 recursive-include docs/figures *.svg *.png
b7048f3e1847 packaging: simplify inclusion of docs in MANIFEST.in
Anton Shestakov <av6@dwimlabs.net>
parents: 5128
diff changeset
17 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
18
3528fb011417 manifest: make sure exclusions and prunes are last, because order matters
Anton Shestakov <av6@dwimlabs.net>
parents: 5130
diff changeset
19 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
20 exclude .gitlab-ci.yml
5248
8c44f02e7200 manifest: now that there's only one legacy.py, exclude it
Anton Shestakov <av6@dwimlabs.net>
parents: 5247
diff changeset
21 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
22 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
23 exclude Makefile
3528fb011417 manifest: make sure exclusions and prunes are last, because order matters
Anton Shestakov <av6@dwimlabs.net>
parents: 5130
diff changeset
24 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
25 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
26
3528fb011417 manifest: make sure exclusions and prunes are last, because order matters
Anton Shestakov <av6@dwimlabs.net>
parents: 5130
diff changeset
27 prune contrib
3528fb011417 manifest: make sure exclusions and prunes are last, because order matters
Anton Shestakov <av6@dwimlabs.net>
parents: 5130
diff changeset
28 prune debian
3528fb011417 manifest: make sure exclusions and prunes are last, because order matters
Anton Shestakov <av6@dwimlabs.net>
parents: 5130
diff changeset
29 prune .gitlab
3528fb011417 manifest: make sure exclusions and prunes are last, because order matters
Anton Shestakov <av6@dwimlabs.net>
parents: 5130
diff changeset
30 prune hgext3rd/evolve/hack