Mercurial > evolve
annotate MANIFEST.in @ 4442:819bad275701
evolve: add logic to handle a particular case in divergence resolution
Case is: In content divergence, to check if the two csets are on different
parent or same parent what we do is find gca of the two csets and then
compare it with the singlesuccessors of two csets's parents.
Now, if gca is same as singlesuccessors of both the csets then we conclude
that both are on the same parent which is not totally correct as it is
possible that both the parents of two csets are obsolete with a single
successor.
This patch adds the logic to cover the above metioned case correctly,
deciding the part when we need to relocate a cset to other side while
resolving the stack of divergent csets.
Changes in test file demonstrate that before this patch we were not
doing it right because it should have relocated every node to other side
instead of just relocating the first one from the stack.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sat, 23 Mar 2019 02:10:31 +0530 |
parents | b3dbba6e34c9 |
children | 48b30ff742cb |
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 |
3383
733e01473ec2
packaging: update MANIFEST.in to include new tutorial files
Boris Feld <boris.feld@octobus.net>
parents:
3033
diff
changeset
|
10 exclude docs/tutorial/.netlify |
1770
be85d7ce8536
Manifest.in: sort entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1062
diff
changeset
|
11 include COPYING |
524
ba0a3d0f942f
pkg: add proper MANIFEST.in
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
12 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
|
13 include docs/makefile |
be85d7ce8536
Manifest.in: sort entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1062
diff
changeset
|
14 include docs/*.py |
be85d7ce8536
Manifest.in: sort entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1062
diff
changeset
|
15 include docs/README |
524
ba0a3d0f942f
pkg: add proper MANIFEST.in
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
16 include docs/*.rst |
1770
be85d7ce8536
Manifest.in: sort entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1062
diff
changeset
|
17 include docs/static/*.svg |
524
ba0a3d0f942f
pkg: add proper MANIFEST.in
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
18 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
|
19 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
|
20 include hgext3rd/evolve/*.py |
3390
b3dbba6e34c9
evolve: start vendoring third party package cbor
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3383
diff
changeset
|
21 include hgext3rd/evolve/thirdparty/*.py |
2078
890af168ca31
MANIFEST.in: also includes topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2077
diff
changeset
|
22 include hgext3rd/topic/*.py |
3033
13751fef5e66
topics: move README-topic as hgext3rd/topic/README
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3032
diff
changeset
|
23 include hgext3rd/topic/README |
1775
a37ef09e27b1
Manifest.in: include Manifest.in
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1774
diff
changeset
|
24 include MANIFEST.in |
1770
be85d7ce8536
Manifest.in: sort entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1062
diff
changeset
|
25 include README |
3032
ba5b271298e9
README: move CHANGELOG to a new file
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2099
diff
changeset
|
26 include CHANGELOG |
524
ba0a3d0f942f
pkg: add proper MANIFEST.in
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
27 include setup.py |
ba0a3d0f942f
pkg: add proper MANIFEST.in
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
28 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
|
29 include tests/*.sh |
2096
667cf3c020da
MANIFEST.in: fix various mismatch
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2078
diff
changeset
|
30 include tests/testlib/*.sh |
1770
be85d7ce8536
Manifest.in: sort entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1062
diff
changeset
|
31 include tests/*.t |
3383
733e01473ec2
packaging: update MANIFEST.in to include new tutorial files
Boris Feld <boris.feld@octobus.net>
parents:
3033
diff
changeset
|
32 recursive-include docs/tutorial *.rst |
733e01473ec2
packaging: update MANIFEST.in to include new tutorial files
Boris Feld <boris.feld@octobus.net>
parents:
3033
diff
changeset
|
33 recursive-include docs/tutorial *.css |
733e01473ec2
packaging: update MANIFEST.in to include new tutorial files
Boris Feld <boris.feld@octobus.net>
parents:
3033
diff
changeset
|
34 include docs/tutorial/standalone.html |
733e01473ec2
packaging: update MANIFEST.in to include new tutorial files
Boris Feld <boris.feld@octobus.net>
parents:
3033
diff
changeset
|
35 recursive-include docs/tutorial *.js |
733e01473ec2
packaging: update MANIFEST.in to include new tutorial files
Boris Feld <boris.feld@octobus.net>
parents:
3033
diff
changeset
|
36 recursive-include docs/tutorial *.md |
733e01473ec2
packaging: update MANIFEST.in to include new tutorial files
Boris Feld <boris.feld@octobus.net>
parents:
3033
diff
changeset
|
37 recursive-include docs/tutorial *.py |
733e01473ec2
packaging: update MANIFEST.in to include new tutorial files
Boris Feld <boris.feld@octobus.net>
parents:
3033
diff
changeset
|
38 recursive-include docs/tutorial *.sh |
733e01473ec2
packaging: update MANIFEST.in to include new tutorial files
Boris Feld <boris.feld@octobus.net>
parents:
3033
diff
changeset
|
39 recursive-include docs/tutorial *.t |
1774
23ea1f4d4040
Manifest.in: exclude debian related file
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1773
diff
changeset
|
40 prune debian |
1770
be85d7ce8536
Manifest.in: sort entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1062
diff
changeset
|
41 recursive-include docs/figures *.svg |