Mercurial > evolve
annotate debian/changelog @ 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 | 0e9821f54ef2 |
children | 727c7211c810 |
rev | line source |
---|---|
1577
0e9821f54ef2
debian: update changelog to 5.2.1
Faheem Mitha <faheem@faheem.info>
parents:
1458
diff
changeset
|
1 mercurial-evolve (5.2.1-1) unstable; urgency=medium |
0e9821f54ef2
debian: update changelog to 5.2.1
Faheem Mitha <faheem@faheem.info>
parents:
1458
diff
changeset
|
2 |
0e9821f54ef2
debian: update changelog to 5.2.1
Faheem Mitha <faheem@faheem.info>
parents:
1458
diff
changeset
|
3 * New upstream release. |
0e9821f54ef2
debian: update changelog to 5.2.1
Faheem Mitha <faheem@faheem.info>
parents:
1458
diff
changeset
|
4 |
0e9821f54ef2
debian: update changelog to 5.2.1
Faheem Mitha <faheem@faheem.info>
parents:
1458
diff
changeset
|
5 -- Faheem Mitha <faheem@faheem.info> Wed, 30 Dec 2015 03:46:06 +0530 |
0e9821f54ef2
debian: update changelog to 5.2.1
Faheem Mitha <faheem@faheem.info>
parents:
1458
diff
changeset
|
6 |
1458
69847c5ffa58
fix debian changelog
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1454
diff
changeset
|
7 mercurial-evolve (5.2.0-1) unstable; urgency=medium |
1424
1377f6a7f9ec
prepare version 5.1.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1275
diff
changeset
|
8 |
1377f6a7f9ec
prepare version 5.1.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1275
diff
changeset
|
9 * New upstream release. |
1377f6a7f9ec
prepare version 5.1.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1275
diff
changeset
|
10 |
1458
69847c5ffa58
fix debian changelog
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1454
diff
changeset
|
11 -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Thu, 25 Jun 2015 17:41:56 -0700 |
1424
1377f6a7f9ec
prepare version 5.1.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1275
diff
changeset
|
12 |
1275
783aa685c5d4
Update debian packaging for 5.1.3
Julien Cristau <julien.cristau@logilab.fr>
parents:
1274
diff
changeset
|
13 mercurial-evolve (5.1.3-1) unstable; urgency=medium |
783aa685c5d4
Update debian packaging for 5.1.3
Julien Cristau <julien.cristau@logilab.fr>
parents:
1274
diff
changeset
|
14 |
783aa685c5d4
Update debian packaging for 5.1.3
Julien Cristau <julien.cristau@logilab.fr>
parents:
1274
diff
changeset
|
15 * new upstream release |
783aa685c5d4
Update debian packaging for 5.1.3
Julien Cristau <julien.cristau@logilab.fr>
parents:
1274
diff
changeset
|
16 |
783aa685c5d4
Update debian packaging for 5.1.3
Julien Cristau <julien.cristau@logilab.fr>
parents:
1274
diff
changeset
|
17 -- Julien Cristau <julien.cristau@logilab.fr> Mon, 20 Apr 2015 14:44:45 +0200 |
783aa685c5d4
Update debian packaging for 5.1.3
Julien Cristau <julien.cristau@logilab.fr>
parents:
1274
diff
changeset
|
18 |
1189
dbd0733e5840
prepare release 5.0.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1180
diff
changeset
|
19 mercurial-evolve (5.0.2-1) unstable; urgency=medium |
dbd0733e5840
prepare release 5.0.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1180
diff
changeset
|
20 |
dbd0733e5840
prepare release 5.0.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1180
diff
changeset
|
21 * new upstream release |
dbd0733e5840
prepare release 5.0.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1180
diff
changeset
|
22 |
dbd0733e5840
prepare release 5.0.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1180
diff
changeset
|
23 -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Sun, 14 Dec 2014 12:43:28 -0800 |
dbd0733e5840
prepare release 5.0.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1180
diff
changeset
|
24 |
1180
b6acfd96c858
debian: update changelog to 5.0.1
Faheem Mitha <faheem@faheem.info>
parents:
1049
diff
changeset
|
25 mercurial-evolve (5.0.1-1) unstable; urgency=medium |
b6acfd96c858
debian: update changelog to 5.0.1
Faheem Mitha <faheem@faheem.info>
parents:
1049
diff
changeset
|
26 |
b6acfd96c858
debian: update changelog to 5.0.1
Faheem Mitha <faheem@faheem.info>
parents:
1049
diff
changeset
|
27 * New upstream release. |
b6acfd96c858
debian: update changelog to 5.0.1
Faheem Mitha <faheem@faheem.info>
parents:
1049
diff
changeset
|
28 |
b6acfd96c858
debian: update changelog to 5.0.1
Faheem Mitha <faheem@faheem.info>
parents:
1049
diff
changeset
|
29 -- Faheem Mitha <faheem@faheem.info> Wed, 12 Nov 2014 11:24:28 +0530 |
b6acfd96c858
debian: update changelog to 5.0.1
Faheem Mitha <faheem@faheem.info>
parents:
1049
diff
changeset
|
30 |
1274
da96dc7ecb65
Update debian packaging for 5.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1189
diff
changeset
|
31 mercurial-evolve (5.0.0+-1) UNRELEASED; urgency=low |
da96dc7ecb65
Update debian packaging for 5.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1189
diff
changeset
|
32 |
da96dc7ecb65
Update debian packaging for 5.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1189
diff
changeset
|
33 * new upstream snapshot |
da96dc7ecb65
Update debian packaging for 5.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1189
diff
changeset
|
34 |
da96dc7ecb65
Update debian packaging for 5.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1189
diff
changeset
|
35 -- Julien Cristau <julien.cristau@logilab.fr> Mon, 17 Nov 2014 15:44:32 +0100 |
da96dc7ecb65
Update debian packaging for 5.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1189
diff
changeset
|
36 |
1049
4d5d101e878f
pkg: prepare release 4.1.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1030
diff
changeset
|
37 mercurial-evolve (4.1.0-1) unstable; urgency=medium |
4d5d101e878f
pkg: prepare release 4.1.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1030
diff
changeset
|
38 |
4d5d101e878f
pkg: prepare release 4.1.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1030
diff
changeset
|
39 * new upstream release |
4d5d101e878f
pkg: prepare release 4.1.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1030
diff
changeset
|
40 |
4d5d101e878f
pkg: prepare release 4.1.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1030
diff
changeset
|
41 -- Pierre-Yves David <pyd@marginatus.alto.octopoid.net> Fri, 08 Aug 2014 23:15:11 -0700 |
4d5d101e878f
pkg: prepare release 4.1.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1030
diff
changeset
|
42 |
1030
e914884fb721
evolve: prepare release 4.0.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1029
diff
changeset
|
43 mercurial-evolve (4.0.1-1) unstable; urgency=medium |
e914884fb721
evolve: prepare release 4.0.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1029
diff
changeset
|
44 |
e914884fb721
evolve: prepare release 4.0.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1029
diff
changeset
|
45 * new upstream release |
e914884fb721
evolve: prepare release 4.0.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1029
diff
changeset
|
46 |
e914884fb721
evolve: prepare release 4.0.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1029
diff
changeset
|
47 -- Pierre-Yves David <pyd@marginatus.alto.octopoid.net> Fri, 08 Aug 2014 15:50:09 -0700 |
e914884fb721
evolve: prepare release 4.0.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1029
diff
changeset
|
48 |
1029
8012d2cfa254
evolve: fix distribution for 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
970
diff
changeset
|
49 mercurial-evolve (4.0.0-1) unstable; urgency=low |
736 | 50 |
970
0304fc2bab15
pkg: prepare release of version 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
736
diff
changeset
|
51 [ Julien Cristau ] |
736 | 52 * New upstream release. |
53 | |
970
0304fc2bab15
pkg: prepare release of version 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
736
diff
changeset
|
54 [ Pierre-Yves David ] |
0304fc2bab15
pkg: prepare release of version 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
736
diff
changeset
|
55 * new upstream release |
0304fc2bab15
pkg: prepare release of version 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
736
diff
changeset
|
56 |
1029
8012d2cfa254
evolve: fix distribution for 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
970
diff
changeset
|
57 -- Pierre-Yves David <pyd@marginatus.alto.octopoid.net> Fri, 08 Aug 2014 15:48:16 -0700 |
736 | 58 |
721
26930fab9c8e
update debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
628
diff
changeset
|
59 mercurial-evolve (3.1.0-1) UNRELEASED; urgency=low |
26930fab9c8e
update debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
628
diff
changeset
|
60 |
26930fab9c8e
update debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
628
diff
changeset
|
61 * New upstream release. |
26930fab9c8e
update debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
628
diff
changeset
|
62 |
26930fab9c8e
update debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
628
diff
changeset
|
63 -- Pierre-Yves David <pierre-yves.david@logilab.fr> Mon, 04 Mar 2013 18:02:15 +0100 |
26930fab9c8e
update debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
628
diff
changeset
|
64 |
628
f9d305deeff3
[prepare] 2.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
613
diff
changeset
|
65 mercurial-evolve (2.1.0-1) UNRELEASED; urgency=low |
f9d305deeff3
[prepare] 2.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
613
diff
changeset
|
66 |
f9d305deeff3
[prepare] 2.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
613
diff
changeset
|
67 * New upstream release |
f9d305deeff3
[prepare] 2.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
613
diff
changeset
|
68 |
f9d305deeff3
[prepare] 2.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
613
diff
changeset
|
69 -- Pierre-Yves David <pierre-yves.david@logilab.fr> Mon, 03 Dec 2012 15:19:19 +0100 |
f9d305deeff3
[prepare] 2.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
613
diff
changeset
|
70 |
613
22cacfce2a65
fix version in setup.py
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
568
diff
changeset
|
71 mercurial-evolve (1.1.0-1) UNRELEASED; urgency=low |
22cacfce2a65
fix version in setup.py
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
568
diff
changeset
|
72 |
22cacfce2a65
fix version in setup.py
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
568
diff
changeset
|
73 * New upstream release. |
22cacfce2a65
fix version in setup.py
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
568
diff
changeset
|
74 |
22cacfce2a65
fix version in setup.py
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
568
diff
changeset
|
75 -- Pierre-Yves David <pierre-yves.david@logilab.fr> Tue, 20 Nov 2012 16:28:12 +0100 |
22cacfce2a65
fix version in setup.py
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
568
diff
changeset
|
76 |
568
e46a04302e4f
upgrade debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
545
diff
changeset
|
77 mercurial-evolve (1.0.2-1) UNRELEASED; urgency=low |
e46a04302e4f
upgrade debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
545
diff
changeset
|
78 |
e46a04302e4f
upgrade debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
545
diff
changeset
|
79 * New upstream Release |
e46a04302e4f
upgrade debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
545
diff
changeset
|
80 |
e46a04302e4f
upgrade debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
545
diff
changeset
|
81 -- Pierre-Yves David <pierre-yves.david@logilab.fr> Wed, 19 Sep 2012 17:38:47 +0200 |
e46a04302e4f
upgrade debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
545
diff
changeset
|
82 |
545
31932df8309a
pkg: proper debian version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
544
diff
changeset
|
83 mercurial-evolve (1.0.1-1) UNRELEASED; urgency=low |
544
4dba9a52dcab
pkg: debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
531
diff
changeset
|
84 |
4dba9a52dcab
pkg: debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
531
diff
changeset
|
85 * New bug fix release |
4dba9a52dcab
pkg: debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
531
diff
changeset
|
86 * remove conflicting __init__.py |
4dba9a52dcab
pkg: debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
531
diff
changeset
|
87 |
4dba9a52dcab
pkg: debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
531
diff
changeset
|
88 -- Pierre-Yves David <pierre-yves.david@logilab.fr> Fri, 31 Aug 2012 11:31:03 +0200 |
4dba9a52dcab
pkg: debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
531
diff
changeset
|
89 |
531
b18b00036355
pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
90 mercurial-evolve (1.0.0-1) UNRELEASED; urgency=low |
b18b00036355
pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
91 |
b18b00036355
pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
92 * Initial release. |
b18b00036355
pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
93 |
b18b00036355
pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
94 -- Julien Cristau <jcristau@debian.org> Fri, 24 Aug 2012 16:46:30 +0200 |