Mercurial > evolve

annotate debian/changelog @ 1467:5c385b812500 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: dedupe divergents when running evolve --all --any or evolve --rev Before this patch, when running evolve --all --any or evolve --rev with the --divergent flag, we were selecting all of the divergents. After solving the first one, its counterparts would get pruned and potentially hidden which would crash when trying to resolve them. This patch introduces logic to dedupe the divergents to be resolved by keeping only one per group of divergent with the lower revision number.
author Laurent Charignon <lcharignon@fb.com>
date Wed, 24 Jun 2015 16:54:23 -0700
parents 69847c5ffa58
children 0e9821f54ef2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1458
69847c5ffa58 fix debian changelog
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1454
diff changeset
1 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
2
1377f6a7f9ec prepare version 5.1.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1275
diff changeset
3 * New upstream release.
1377f6a7f9ec prepare version 5.1.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1275
diff changeset
4
1458
69847c5ffa58 fix debian changelog
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1454
diff changeset
5 -- 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
6
1275
783aa685c5d4 Update debian packaging for 5.1.3
Julien Cristau <julien.cristau@logilab.fr>
parents: 1274
diff changeset
7 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
8
783aa685c5d4 Update debian packaging for 5.1.3
Julien Cristau <julien.cristau@logilab.fr>
parents: 1274
diff changeset
9 * new upstream release
783aa685c5d4 Update debian packaging for 5.1.3
Julien Cristau <julien.cristau@logilab.fr>
parents: 1274
diff changeset
10
783aa685c5d4 Update debian packaging for 5.1.3
Julien Cristau <julien.cristau@logilab.fr>
parents: 1274
diff changeset
11 -- 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
12
1189
dbd0733e5840 prepare release 5.0.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1180
diff changeset
13 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
14
dbd0733e5840 prepare release 5.0.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1180
diff changeset
15 * new upstream release
dbd0733e5840 prepare release 5.0.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1180
diff changeset
16
dbd0733e5840 prepare release 5.0.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1180
diff changeset
17 -- 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
18
1180
b6acfd96c858 debian: update changelog to 5.0.1
Faheem Mitha <faheem@faheem.info>
parents: 1049
diff changeset
19 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
20
b6acfd96c858 debian: update changelog to 5.0.1
Faheem Mitha <faheem@faheem.info>
parents: 1049
diff changeset
21 * New upstream release.
b6acfd96c858 debian: update changelog to 5.0.1
Faheem Mitha <faheem@faheem.info>
parents: 1049
diff changeset
22
b6acfd96c858 debian: update changelog to 5.0.1
Faheem Mitha <faheem@faheem.info>
parents: 1049
diff changeset
23 -- 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
24
1274
da96dc7ecb65 Update debian packaging for 5.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1189
diff changeset
25 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
26
da96dc7ecb65 Update debian packaging for 5.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1189
diff changeset
27 * new upstream snapshot
da96dc7ecb65 Update debian packaging for 5.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1189
diff changeset
28
da96dc7ecb65 Update debian packaging for 5.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1189
diff changeset
29 -- 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
30
1049
4d5d101e878f pkg: prepare release 4.1.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1030
diff changeset
31 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
32
4d5d101e878f pkg: prepare release 4.1.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1030
diff changeset
33 * new upstream release
4d5d101e878f pkg: prepare release 4.1.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1030
diff changeset
34
4d5d101e878f pkg: prepare release 4.1.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1030
diff changeset
35 -- 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
36
1030
e914884fb721 evolve: prepare release 4.0.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1029
diff changeset
37 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
38
e914884fb721 evolve: prepare release 4.0.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1029
diff changeset
39 * new upstream release
e914884fb721 evolve: prepare release 4.0.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1029
diff changeset
40
e914884fb721 evolve: prepare release 4.0.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1029
diff changeset
41 -- 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
42
1029
8012d2cfa254 evolve: fix distribution for 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 970
diff changeset
43 mercurial-evolve (4.0.0-1) unstable; urgency=low
736
Julien Cristau <julien.cristau@logilab.fr>
parents: 721
diff changeset
44
970
0304fc2bab15 pkg: prepare release of version 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 736
diff changeset
45 [ Julien Cristau ]
736
Julien Cristau <julien.cristau@logilab.fr>
parents: 721
diff changeset
46 * New upstream release.
Julien Cristau <julien.cristau@logilab.fr>
parents: 721
diff changeset
47
970
0304fc2bab15 pkg: prepare release of version 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 736
diff changeset
48 [ Pierre-Yves David ]
0304fc2bab15 pkg: prepare release of version 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 736
diff changeset
49 * new upstream release
0304fc2bab15 pkg: prepare release of version 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 736
diff changeset
50
1029
8012d2cfa254 evolve: fix distribution for 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 970
diff changeset
51 -- Pierre-Yves David <pyd@marginatus.alto.octopoid.net> Fri, 08 Aug 2014 15:48:16 -0700
736
Julien Cristau <julien.cristau@logilab.fr>
parents: 721
diff changeset
52
721
26930fab9c8e update debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 628
diff changeset
53 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
54
26930fab9c8e update debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 628
diff changeset
55 * New upstream release.
26930fab9c8e update debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 628
diff changeset
56
26930fab9c8e update debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 628
diff changeset
57 -- 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
58
628
f9d305deeff3 [prepare] 2.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 613
diff changeset
59 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
60
f9d305deeff3 [prepare] 2.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 613
diff changeset
61 * New upstream release
f9d305deeff3 [prepare] 2.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 613
diff changeset
62
f9d305deeff3 [prepare] 2.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 613
diff changeset
63 -- 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
64
613
22cacfce2a65 fix version in setup.py
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 568
diff changeset
65 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
66
22cacfce2a65 fix version in setup.py
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 568
diff changeset
67 * New upstream release.
22cacfce2a65 fix version in setup.py
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 568
diff changeset
68
22cacfce2a65 fix version in setup.py
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 568
diff changeset
69 -- 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
70
568
e46a04302e4f upgrade debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 545
diff changeset
71 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
72
e46a04302e4f upgrade debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 545
diff changeset
73 * New upstream Release
e46a04302e4f upgrade debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 545
diff changeset
74
e46a04302e4f upgrade debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 545
diff changeset
75 -- 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
76
545
31932df8309a pkg: proper debian version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 544
diff changeset
77 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
78
4dba9a52dcab pkg: debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 531
diff changeset
79 * New bug fix release
4dba9a52dcab pkg: debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 531
diff changeset
80 * remove conflicting __init__.py
4dba9a52dcab pkg: debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 531
diff changeset
81
4dba9a52dcab pkg: debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 531
diff changeset
82 -- 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
83
531
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
84 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
85
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
86 * Initial release.
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
87
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
88 -- Julien Cristau <jcristau@debian.org> Fri, 24 Aug 2012 16:46:30 +0200