Mercurial > evolve
annotate .hgtags @ 1588:983f2e4dbe5d
inhibit: fix compat with rebaseskipobsolete
We wrap _computeobsoletenotrebased and _clearrebased to fix the following case:
- Assuming that we have markers from revisions of the rebase set and
destination set and that these markers are inhibited
- At the end of the rebase the nodes are still visible because rebase operate
without inhibition and skip these nodes
Had we not have those markers to begin with the revisions could be hidden at
the end of the rebase.
We keep track in repo._obsoletenotrebased of the obsolete commits skipped by
the rebase and lift the inhibition at the end of the rebase.
We add three test cases to make sure that the edge cases are covered.
author | Laurent Charignon <lcharignon@fb.com> |
---|---|
date | Wed, 27 Jan 2016 13:57:08 -0800 |
parents | 681f675401ff |
children | 4bb48b1da1f8 |
rev | line source |
---|---|
270
a68b763505c2
Added tag 0.1.0 for changeset 6c6bb7a23bb5
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
1 6c6bb7a23bb5125bf06da73265f039dd3447dafa 0.1.0 |
287
bcd96748edc4
Added tag 0.2.0 for changeset d3f20770b86a
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
270
diff
changeset
|
2 d3f20770b86a31dba56ae7b252089e12b34702da 0.2.0 |
329
786fdc90c8d2
Added tag 0.3.0 for changeset c046b083a5e0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
287
diff
changeset
|
3 c046b083a5e0b21af69027f31cee141800cf894b 0.3.0 |
345
62de989b2a02
Added tag 0.4.0 for changeset 9bbcd2746898
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
329
diff
changeset
|
4 9bbcd274689829d9239978236e16610688978233 0.4.0 |
352
de3edd3856c3
Added tag 0.4.1 for changeset 4ecbaec1d664
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
345
diff
changeset
|
5 4ecbaec1d664b1e6f8ebc78292e1ced77a8e69c0 0.4.1 |
371
381ce7036d6d
Added tag 0.5 for changeset 7ef8ab8c6fea
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
352
diff
changeset
|
6 7ef8ab8c6feadb8a9d9e13af144a17cb23e9a38d 0.5 |
406
24762f1911ba
Added tag 0.6 for changeset 4a5488c01a66
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
371
diff
changeset
|
7 4a5488c01a66be4729252175cea0ea739a88a540 0.6 |
425
1b2757c1bd91
changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
406
diff
changeset
|
8 18a0d96ed559089edf90206c469f3f8c26681c64 0.7 |
426
37cba4324ccf
Added tag 0.7 for changeset 1b2757c1bd91
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
425
diff
changeset
|
9 1b2757c1bd918509184f6c1d06b2329a847e31b0 0.7 |
532
744db7a27dd0
Added tag 1.0.0 for changeset b18b00036355
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
426
diff
changeset
|
10 b18b000363550f02f413aed008f8e306318c608c 1.0.0 |
543
108f4ed36215
Added tag 1.0.1 for changeset ca5bb72d14ae
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
532
diff
changeset
|
11 ca5bb72d14aeb6e6053e3a53c064a2b7dc8010e5 1.0.1 |
563
61e883010b89
Added tag 1.0.2 for changeset b1bdcb4506de
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
543
diff
changeset
|
12 b1bdcb4506defef0e857e2710633f7686d8034a5 1.0.2 |
565
2c57e2b5afde
Added tag 1.0.2 for changeset 5559e5a4b656
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
543
diff
changeset
|
13 5559e5a4b656978c592d364f242edc62369d7e84 1.0.2 |
600
cd29c8c8b0a1
Added tag 1.1.0 for changeset c062edbcaf13
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
566
diff
changeset
|
14 c062edbcaf13135d0312fd2039deca74573ff4f0 1.1.0 |
614
b082cbe8bd79
Added tag 1.1.0 for changeset 22cacfce2a65
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
600
diff
changeset
|
15 22cacfce2a65ab965c6179ae862b148f4abc7d8a 1.1.0 |
605
e0847647fa6a
Added tag 2.0.0 for changeset d43e80504e5
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
600
diff
changeset
|
16 d43e80504e55db9ad4826e860e50530103a27b0f 2.0.0 |
629
87269fca586b
Added tag 2.1.0 for changeset f9d305deeff3
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
616
diff
changeset
|
17 f9d305deeff3dba782e65faf4ef3fd1569995859 2.1.0 |
665
bd88067af19d
Added tag 3.0.0 for changeset 862b6b71a358
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
629
diff
changeset
|
18 862b6b71a35836e81f090ba7229c2888e8ed2f9f 3.0.0 |
719
a0c5d1679354
Added tag 3.1.0 for changeset cdb52bbbe5b8
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
665
diff
changeset
|
19 cdb52bbbe5b8770d5e68943b7e73bee4ba136ecc 3.1.0 |
754
671c8bcdcd20
Added tag 3.2.0 for changeset c3ba8a965a7a
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
719
diff
changeset
|
20 c3ba8a965a7a173e388d84819e936ea9bae9797f 3.2.0 |
860
f3263e022ba8
Added tag 3.3.0 for changeset 83882f2fbecb
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
754
diff
changeset
|
21 83882f2fbecba0b7e7f7e5d490b57db93bd7fa22 3.3.0 |
918
6c5a6c2706f6
Added tag 3.3.1 for changeset fc04758ea9f5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
860
diff
changeset
|
22 fc04758ea9f549684989ee673b04d9724756dc85 3.3.1 |
936
66dab6b2c6e4
Added tag 3.3.2 for changeset a03ea39aca2a
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
918
diff
changeset
|
23 a03ea39aca2a66ea36817512d586dcbc99dbfe9b 3.3.2 |
971
fc7ca26f7491
Added tag 4.0.0 for changeset 0304fc2bab15
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
936
diff
changeset
|
24 0304fc2bab158658df53a8f4edd5aa300a9497d2 4.0.0 |
1031
acc2b590edd9
Added tag 4.0.1 for changeset e914884fb721
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
971
diff
changeset
|
25 e914884fb7210d6350d94909cb25ebc602359680 4.0.1 |
1050
d265efad02cc
Added tag 4.1.0 for changeset 4d5d101e878f
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1031
diff
changeset
|
26 4d5d101e878f6d6264a8e036b11afdf922c4ef94 4.1.0 |
1139
07ccf868dfe1
Added tag 5.0.0 for changeset c13b408c0006
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1050
diff
changeset
|
27 c13b408c00066af78cda88734909c6f2f3505f76 5.0.0 |
1176
7a1d4dcc465f
Added tag 5.0.1 for changeset 51e1e962172c
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1139
diff
changeset
|
28 51e1e962172c0178394cd36652d90181319f5416 5.0.1 |
1178
c4eb9ce7b6a1
Added tag 5.0.1 for changeset 0f3090785283
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1176
diff
changeset
|
29 0f30907852831f818bd0d01141b4ab7d8d71b821 5.0.1 |
1190
1df0bf41016c
Added tag 5.0.2 for changeset dbd0733e5840
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1178
diff
changeset
|
30 dbd0733e584073d6a7b6dea933767853e9cfe845 5.0.2 |
1199
47f3bdbe0d9c
Added tag 5.1.0 for changeset bfe9be352453
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1190
diff
changeset
|
31 bfe9be352453640233371cc7deb409a09decacf9 5.1.0 |
1207
1e7c8046a9f4
Added tag 5.1.1 for changeset 9b8628e0a142
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1199
diff
changeset
|
32 9b8628e0a142e0e094e27430c388e3c12ceba513 5.1.1 |
1231
5b6c42a3e12f
Added tag 5.1.2 for changeset e886bc501796
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1207
diff
changeset
|
33 e886bc501796d53e0a19e608c6e5a6071191819e 5.1.2 |
1258
8873aedbd83d
Added tag 5.1.3 for changeset c52c15100fb2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1231
diff
changeset
|
34 c52c15100fb2d85c3525d6d085b3663ec4f90fe6 5.1.3 |
1282
2da7b531879a
Added tag 5.1.4 for changeset 891c3ce894fa
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1258
diff
changeset
|
35 891c3ce894fa879532299910735bcc2a968245b1 5.1.4 |
1425
e8f875227901
Added tag 5.1.5 for changeset 1377f6a7f9ec
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1282
diff
changeset
|
36 1377f6a7f9ecb25e9b8885fce8f6f42e0d6f3f12 5.1.5 |
1456
773f3edb3cb2
Added tag 5.2.0 for changeset 00026533ff9f
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1425
diff
changeset
|
37 c79bdc8563509cd4e99946593d0b39af40271a30 5.2.0 |
773f3edb3cb2
Added tag 5.2.0 for changeset 00026533ff9f
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1425
diff
changeset
|
38 00026533ff9f52733a45df008e3d56a5d3a8e76a 5.2.0 |
1461
dd89ed2bb77e
Added tag 5.2.0 for changeset 44a9dcb3fefc
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1456
diff
changeset
|
39 44a9dcb3fefcf8281ebe4e359e7dbb637512cf7f 5.2.0 |
1520
681f675401ff
Added tag 5.2.1 for changeset c15d6168412f
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1461
diff
changeset
|
40 c15d6168412f175568dac89e6ee1cd8434fef906 5.2.1 |