annotate MANIFEST.in @ 2624:fd602980f7ee

topics: make sure we commit on new parents while changing topics (issue5441) While changing topics of a set of linear commits, we used to commit our new changesets with new topic on parents of its predecessor i.e. changeset before the topic change. If the topic of parent was also changed, that parent will become obsolete and hence resulting the cnew commit in unstable state. For a set of linear commits this repeats and we end up in a tree state as mentioned in the bug. This patch fixes the bug by checking whether the parent was obsoleted and if yes, commit on the new parent.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 18 Jun 2017 03:23:46 +0530
parents 47017b3086d4
children ba5b271298e9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2096
667cf3c020da MANIFEST.in: fix various mismatch
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2078
diff changeset
1 exclude contrib
667cf3c020da MANIFEST.in: fix various mismatch
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2078
diff changeset
2 recursive-exclude contrib *
667cf3c020da MANIFEST.in: fix various mismatch
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2078
diff changeset
3 exclude hgext3rd/evolve/hack
667cf3c020da MANIFEST.in: fix various mismatch
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2078
diff changeset
4 recursive-exclude hgext3rd/evolve/hack *
1810
ce4018f03520 hgext3rd: move 'obsolete' as 'evolve.legacy'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1809
diff changeset
5 exclude hgext3rd/evolve/legacy.py
1774
23ea1f4d4040 Manifest.in: exclude debian related file
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1773
diff changeset
6 exclude Makefile
1770
be85d7ce8536 Manifest.in: sort entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1062
diff changeset
7 exclude tests/test-drop.t
1776
cb2bac3253fb Manifest.in: exclude unshipped extensions
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1775
diff changeset
8 exclude tests/test-inhibit.t
1770
be85d7ce8536 Manifest.in: sort entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1062
diff changeset
9 exclude tests/test-oldconvert.t
be85d7ce8536 Manifest.in: sort entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1062
diff changeset
10 include COPYING
524
ba0a3d0f942f pkg: add proper MANIFEST.in
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
11 include docs/figures/hgview-example.png
1770
be85d7ce8536 Manifest.in: sort entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1062
diff changeset
12 include docs/makefile
be85d7ce8536 Manifest.in: sort entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1062
diff changeset
13 include docs/*.py
be85d7ce8536 Manifest.in: sort entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1062
diff changeset
14 include docs/README
524
ba0a3d0f942f pkg: add proper MANIFEST.in
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
15 include docs/*.rst
1770
be85d7ce8536 Manifest.in: sort entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1062
diff changeset
16 include docs/static/*.svg
524
ba0a3d0f942f pkg: add proper MANIFEST.in
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
17 include docs/tutorials/*.t
1806
9f42f819267b evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1805
diff changeset
18 include hgext3rd/__init__.py
2077
95f37f9a9064 MANIFEST.in: fix to include all evolve submodule
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1811
diff changeset
19 include hgext3rd/evolve/*.py
2078
890af168ca31 MANIFEST.in: also includes topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2077
diff changeset
20 include hgext3rd/topic/*.py
1775
a37ef09e27b1 Manifest.in: include Manifest.in
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1774
diff changeset
21 include MANIFEST.in
1770
be85d7ce8536 Manifest.in: sort entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1062
diff changeset
22 include README
2099
47017b3086d4 README: more update to prepare for pypi upload
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2096
diff changeset
23 include README-topic
524
ba0a3d0f942f pkg: add proper MANIFEST.in
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
24 include setup.py
ba0a3d0f942f pkg: add proper MANIFEST.in
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
25 include tests/*.py
1773
28745dc48ba0 Manifest.in: include all script in tests
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1772
diff changeset
26 include tests/*.sh
2096
667cf3c020da MANIFEST.in: fix various mismatch
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2078
diff changeset
27 include tests/testlib/*.sh
1770
be85d7ce8536 Manifest.in: sort entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1062
diff changeset
28 include tests/*.t
1774
23ea1f4d4040 Manifest.in: exclude debian related file
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1773
diff changeset
29 prune debian
1770
be85d7ce8536 Manifest.in: sort entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1062
diff changeset
30 recursive-include docs/figures *.svg