Mercurial > evolve

annotate debian/changelog @ 3805:2410e7063692

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: implement resolution of content-divergence when on differet parents This patch implements the basic version of resolution of content-divergence changesets when they are on different parents but one of the parent is gca of both the different parents. The functionality first relocates the divergent changeset which was left behind and then resolves the content-divergence like it resolves in normal cases. This is a very basic implementation because it still does not work on interrupted evolution. Test changes in this patch shows the basic functionality working. The output of dry-run is also required to be tweaked in such cased. Upcoming patches will add more tests and will improve the implementation to work during conflicts too.
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 01 Jun 2018 19:52:06 +0530
parents 116cdd8c102a
children 0887c30255a1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3720
116cdd8c102a packaging: update version number
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3587
diff changeset
1 mercurial-evolve (8.0.0-1) UNRELEASED; urgency=medium
116cdd8c102a packaging: update version number
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3587
diff changeset
2
116cdd8c102a packaging: update version number
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3587
diff changeset
3 * New upstream release
116cdd8c102a packaging: update version number
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3587
diff changeset
4
116cdd8c102a packaging: update version number
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3587
diff changeset
5 -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Wed, 25 Apr 2018 14:01:18 +0100
116cdd8c102a packaging: update version number
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3587
diff changeset
6
3587
2e7a9f6df411 debian: add version 7.3.0 to changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3439
diff changeset
7 mercurial-evolve (7.3.0-1) unstable; urgency=medium
2e7a9f6df411 debian: add version 7.3.0 to changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3439
diff changeset
8
2e7a9f6df411 debian: add version 7.3.0 to changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3439
diff changeset
9 * New upstream release
2e7a9f6df411 debian: add version 7.3.0 to changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3439
diff changeset
10
2e7a9f6df411 debian: add version 7.3.0 to changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3439
diff changeset
11 -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Wed, 21 Mar 2018 15:34:15 +0100
2e7a9f6df411 debian: add version 7.3.0 to changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3439
diff changeset
12
3439
6c772398eb4e packaging: prepare version 7.2.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3405
diff changeset
13 mercurial-evolve (7.2.1-1) unstable; urgency=medium
3405
5813075618b4 packaging: prepare version 7.2.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3291
diff changeset
14
5813075618b4 packaging: prepare version 7.2.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3291
diff changeset
15 * new upstream release
5813075618b4 packaging: prepare version 7.2.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3291
diff changeset
16
3439
6c772398eb4e packaging: prepare version 7.2.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3405
diff changeset
17 -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Sat, 20 Jan 2018 12:28:16 +0100
3405
5813075618b4 packaging: prepare version 7.2.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3291
diff changeset
18
3291
06a3cb594956 packaging: prepare release 7.1.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3194
diff changeset
19 mercurial-evolve (7.1.0-1) unstable; urgency=medium
06a3cb594956 packaging: prepare release 7.1.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3194
diff changeset
20
06a3cb594956 packaging: prepare release 7.1.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3194
diff changeset
21 * new upstream release
06a3cb594956 packaging: prepare release 7.1.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3194
diff changeset
22
06a3cb594956 packaging: prepare release 7.1.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3194
diff changeset
23 -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Tue, 12 Dec 2017 03:01:27 +0100
06a3cb594956 packaging: prepare release 7.1.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3194
diff changeset
24
06a3cb594956 packaging: prepare release 7.1.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3194
diff changeset
25 mercurial-evolve (7.0.1-1) unstable; urgency=medium
3194
f5d5f08c8f08 packaging: mark version as development version.
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3163
diff changeset
26
f5d5f08c8f08 packaging: mark version as development version.
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3163
diff changeset
27 * new upstream release
f5d5f08c8f08 packaging: mark version as development version.
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3163
diff changeset
28
f5d5f08c8f08 packaging: mark version as development version.
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3163
diff changeset
29 -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Wed, 15 Nov 2017 00:14:42 +0100
f5d5f08c8f08 packaging: mark version as development version.
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3163
diff changeset
30
3163
c56c028f3802 packaging: prepare version 7.0.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3125
diff changeset
31 mercurial-evolve (7.0.0-1) unstable; urgency=medium
c56c028f3802 packaging: prepare version 7.0.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3125
diff changeset
32
c56c028f3802 packaging: prepare version 7.0.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3125
diff changeset
33 * new upstream release
c56c028f3802 packaging: prepare version 7.0.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3125
diff changeset
34
c56c028f3802 packaging: prepare version 7.0.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3125
diff changeset
35 -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Thu, 02 Nov 2017 00:30:29 +0100
c56c028f3802 packaging: prepare version 7.0.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3125
diff changeset
36
c56c028f3802 packaging: prepare version 7.0.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3125
diff changeset
37 mercurial-evolve (6.8.0-1) unstable; urgency=medium
3125
ec0bbf26ce7f packaging: prepare version 6.8.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3048
diff changeset
38
ec0bbf26ce7f packaging: prepare version 6.8.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3048
diff changeset
39 * new upstream release
ec0bbf26ce7f packaging: prepare version 6.8.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3048
diff changeset
40
ec0bbf26ce7f packaging: prepare version 6.8.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3048
diff changeset
41 -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Mon, 23 Oct 2017 15:41:03 +0200
ec0bbf26ce7f packaging: prepare version 6.8.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3048
diff changeset
42
3048
bdc28886526f packaging: prepare version 6.7.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3010
diff changeset
43 mercurial-evolve (6.7.1-1) unstable; urgency=medium
bdc28886526f packaging: prepare version 6.7.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3010
diff changeset
44
bdc28886526f packaging: prepare version 6.7.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3010
diff changeset
45 * new upstream release
bdc28886526f packaging: prepare version 6.7.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3010
diff changeset
46
bdc28886526f packaging: prepare version 6.7.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3010
diff changeset
47 -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Tue, 10 Oct 2017 16:03:23 +0200
bdc28886526f packaging: prepare version 6.7.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3010
diff changeset
48
bdc28886526f packaging: prepare version 6.7.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3010
diff changeset
49 mercurial-evolve (6.7.0-1) unstable; urgency=medium
3010
3a4f75c6619c packaging: update debian changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2818
diff changeset
50
3a4f75c6619c packaging: update debian changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2818
diff changeset
51 * new upstream release
3a4f75c6619c packaging: update debian changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2818
diff changeset
52
3a4f75c6619c packaging: update debian changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2818
diff changeset
53 -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Wed, 27 Sep 2017 16:17:40 +0200
3a4f75c6619c packaging: update debian changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2818
diff changeset
54
2818
4ec404e68abd debian: add a 6.6.0-1 changelog entry
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2817
diff changeset
55 mercurial-evolve (6.6.0-1) unstable; urgency=medium
4ec404e68abd debian: add a 6.6.0-1 changelog entry
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2817
diff changeset
56
4ec404e68abd debian: add a 6.6.0-1 changelog entry
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2817
diff changeset
57 * new upstream release
4ec404e68abd debian: add a 6.6.0-1 changelog entry
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2817
diff changeset
58
4ec404e68abd debian: add a 6.6.0-1 changelog entry
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2817
diff changeset
59 -- Pierre-Yves David <marmoute@nodosa.octopoid.net> Tue, 25 Jul 2017 16:57:25 +0200
4ec404e68abd debian: add a 6.6.0-1 changelog entry
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2817
diff changeset
60
2817
95fdb85f46e2 debian: fix 6.5.0-1 changelog entry
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2706
diff changeset
61 mercurial-evolve (6.5.0-1) unstable; urgency=medium
2706
734c0bc066cd packaging: prepare version 6.5.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2620
diff changeset
62
734c0bc066cd packaging: prepare version 6.5.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2620
diff changeset
63 * new upstream release
734c0bc066cd packaging: prepare version 6.5.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2620
diff changeset
64
2817
95fdb85f46e2 debian: fix 6.5.0-1 changelog entry
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2706
diff changeset
65 -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Sun, 02 Jul 2017 19:35:17 +0200
2706
734c0bc066cd packaging: prepare version 6.5.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2620
diff changeset
66
2620
e60248f26f92 packaging: prepare version 6.4.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2544
diff changeset
67 mercurial-evolve (6.4.0-1) unstable; urgency=medium
e60248f26f92 packaging: prepare version 6.4.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2544
diff changeset
68
e60248f26f92 packaging: prepare version 6.4.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2544
diff changeset
69 * new upstream release
e60248f26f92 packaging: prepare version 6.4.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2544
diff changeset
70
e60248f26f92 packaging: prepare version 6.4.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2544
diff changeset
71 -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Fri, 16 Jun 2017 20:14:13 +0200
e60248f26f92 packaging: prepare version 6.4.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2544
diff changeset
72
2544
e358c0263e46 prepare release 6.3.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2535
diff changeset
73 mercurial-evolve (6.3.1-1) unstable; urgency=medium
e358c0263e46 prepare release 6.3.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2535
diff changeset
74
e358c0263e46 prepare release 6.3.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2535
diff changeset
75 * new upstream release
e358c0263e46 prepare release 6.3.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2535
diff changeset
76
e358c0263e46 prepare release 6.3.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2535
diff changeset
77 -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Thu, 01 Jun 2017 16:25:26 +0200
e358c0263e46 prepare release 6.3.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2535
diff changeset
78
2535
6da4ca7b3e4f packaging: prepare release 6.3.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2471
diff changeset
79 mercurial-evolve (6.3.0-1) unstable; urgency=medium
6da4ca7b3e4f packaging: prepare release 6.3.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2471
diff changeset
80
6da4ca7b3e4f packaging: prepare release 6.3.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2471
diff changeset
81 * New upstream release
6da4ca7b3e4f packaging: prepare release 6.3.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2471
diff changeset
82
6da4ca7b3e4f packaging: prepare release 6.3.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2471
diff changeset
83 -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Wed, 31 May 2017 14:33:33 +0200
6da4ca7b3e4f packaging: prepare release 6.3.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2471
diff changeset
84
2471
0af99106b075 packaging: prepare release 6.2.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2430
diff changeset
85 mercurial-evolve (6.2.1-1) unstable; urgency=medium
0af99106b075 packaging: prepare release 6.2.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2430
diff changeset
86
0af99106b075 packaging: prepare release 6.2.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2430
diff changeset
87 * new upstream release
0af99106b075 packaging: prepare release 6.2.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2430
diff changeset
88
0af99106b075 packaging: prepare release 6.2.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2430
diff changeset
89 -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Tue, 23 May 2017 10:47:36 +0200
0af99106b075 packaging: prepare release 6.2.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2430
diff changeset
90
2430
d4ee0274a8ef packaging: prepare release 6.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2429
diff changeset
91 mercurial-evolve (6.2.0-1) unstable; urgency=medium
d4ee0274a8ef packaging: prepare release 6.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2429
diff changeset
92
d4ee0274a8ef packaging: prepare release 6.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2429
diff changeset
93 * new upstream release
d4ee0274a8ef packaging: prepare release 6.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2429
diff changeset
94
d4ee0274a8ef packaging: prepare release 6.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2429
diff changeset
95 -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Thu, 18 May 2017 22:24:10 +0200
d4ee0274a8ef packaging: prepare release 6.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2429
diff changeset
96
2322
8510d3fd7c3b packaging: prepare version 6.1.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2283
diff changeset
97 mercurial-evolve (6.1.0-1) unstable; urgency=medium
8510d3fd7c3b packaging: prepare version 6.1.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2283
diff changeset
98
8510d3fd7c3b packaging: prepare version 6.1.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2283
diff changeset
99 * New upstream release
8510d3fd7c3b packaging: prepare version 6.1.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2283
diff changeset
100
2429
2ae765aab437 debian: fix email
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2322
diff changeset
101 -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Wed, 03 May 2017 13:57:15 +0200
2322
8510d3fd7c3b packaging: prepare version 6.1.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2283
diff changeset
102
8510d3fd7c3b packaging: prepare version 6.1.0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2283
diff changeset
103 mercurial-evolve (6.0.1-1) unstable; urgency=medium
2283
5ef112a6eb87 pkg: prepare release 6.0.1
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2282
diff changeset
104
5ef112a6eb87 pkg: prepare release 6.0.1
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2282
diff changeset
105 * New upstream version
5ef112a6eb87 pkg: prepare release 6.0.1
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2282
diff changeset
106
2429
2ae765aab437 debian: fix email
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2322
diff changeset
107 -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Thu, 20 Apr 2017 12:58:35 +0200
2283
5ef112a6eb87 pkg: prepare release 6.0.1
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2282
diff changeset
108
2282
3d071cbdf5bc debian: finalize 6.0.0 entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2263
diff changeset
109 mercurial-evolve (6.0.0-1) unstable; urgency=medium
1790
d4ce86ac5024 prepare release 5.6.0
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1789
diff changeset
110
d4ce86ac5024 prepare release 5.6.0
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1789
diff changeset
111 * New Upstream Release
d4ce86ac5024 prepare release 5.6.0
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1789
diff changeset
112
2429
2ae765aab437 debian: fix email
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2322
diff changeset
113 -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Thu, 20 Apr 2017 12:58:03 +0200
1790
d4ce86ac5024 prepare release 5.6.0
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1789
diff changeset
114
1789
0b67eff25139 debian: fix version format
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1765
diff changeset
115 mercurial-evolve (5.5.0-1) unstable; urgency=medium
1765
727c7211c810 prepare release 5.5.0
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1577
diff changeset
116
727c7211c810 prepare release 5.5.0
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1577
diff changeset
117 * new upstream release
727c7211c810 prepare release 5.5.0
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1577
diff changeset
118
727c7211c810 prepare release 5.5.0
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1577
diff changeset
119 -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Sun, 30 Oct 2016 23:27:14 +0100
727c7211c810 prepare release 5.5.0
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1577
diff changeset
120
1577
0e9821f54ef2 debian: update changelog to 5.2.1
Faheem Mitha <faheem@faheem.info>
parents: 1458
diff changeset
121 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
122
0e9821f54ef2 debian: update changelog to 5.2.1
Faheem Mitha <faheem@faheem.info>
parents: 1458
diff changeset
123 * New upstream release.
0e9821f54ef2 debian: update changelog to 5.2.1
Faheem Mitha <faheem@faheem.info>
parents: 1458
diff changeset
124
0e9821f54ef2 debian: update changelog to 5.2.1
Faheem Mitha <faheem@faheem.info>
parents: 1458
diff changeset
125 -- 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
126
1458
69847c5ffa58 fix debian changelog
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1454
diff changeset
127 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
128
1377f6a7f9ec prepare version 5.1.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1275
diff changeset
129 * New upstream release.
1377f6a7f9ec prepare version 5.1.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1275
diff changeset
130
1458
69847c5ffa58 fix debian changelog
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1454
diff changeset
131 -- 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
132
1275
783aa685c5d4 Update debian packaging for 5.1.3
Julien Cristau <julien.cristau@logilab.fr>
parents: 1274
diff changeset
133 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
134
783aa685c5d4 Update debian packaging for 5.1.3
Julien Cristau <julien.cristau@logilab.fr>
parents: 1274
diff changeset
135 * new upstream release
783aa685c5d4 Update debian packaging for 5.1.3
Julien Cristau <julien.cristau@logilab.fr>
parents: 1274
diff changeset
136
783aa685c5d4 Update debian packaging for 5.1.3
Julien Cristau <julien.cristau@logilab.fr>
parents: 1274
diff changeset
137 -- 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
138
1189
dbd0733e5840 prepare release 5.0.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1180
diff changeset
139 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
140
dbd0733e5840 prepare release 5.0.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1180
diff changeset
141 * new upstream release
dbd0733e5840 prepare release 5.0.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1180
diff changeset
142
dbd0733e5840 prepare release 5.0.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1180
diff changeset
143 -- 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
144
1180
b6acfd96c858 debian: update changelog to 5.0.1
Faheem Mitha <faheem@faheem.info>
parents: 1049
diff changeset
145 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
146
b6acfd96c858 debian: update changelog to 5.0.1
Faheem Mitha <faheem@faheem.info>
parents: 1049
diff changeset
147 * New upstream release.
b6acfd96c858 debian: update changelog to 5.0.1
Faheem Mitha <faheem@faheem.info>
parents: 1049
diff changeset
148
b6acfd96c858 debian: update changelog to 5.0.1
Faheem Mitha <faheem@faheem.info>
parents: 1049
diff changeset
149 -- 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
150
1274
da96dc7ecb65 Update debian packaging for 5.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1189
diff changeset
151 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
152
da96dc7ecb65 Update debian packaging for 5.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1189
diff changeset
153 * new upstream snapshot
da96dc7ecb65 Update debian packaging for 5.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1189
diff changeset
154
da96dc7ecb65 Update debian packaging for 5.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1189
diff changeset
155 -- 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
156
1049
4d5d101e878f pkg: prepare release 4.1.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1030
diff changeset
157 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
158
4d5d101e878f pkg: prepare release 4.1.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1030
diff changeset
159 * new upstream release
4d5d101e878f pkg: prepare release 4.1.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1030
diff changeset
160
4d5d101e878f pkg: prepare release 4.1.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1030
diff changeset
161 -- 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
162
1030
e914884fb721 evolve: prepare release 4.0.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1029
diff changeset
163 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
164
e914884fb721 evolve: prepare release 4.0.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1029
diff changeset
165 * new upstream release
e914884fb721 evolve: prepare release 4.0.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1029
diff changeset
166
e914884fb721 evolve: prepare release 4.0.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1029
diff changeset
167 -- 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
168
1029
8012d2cfa254 evolve: fix distribution for 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 970
diff changeset
169 mercurial-evolve (4.0.0-1) unstable; urgency=low
736
Julien Cristau <julien.cristau@logilab.fr>
parents: 721
diff changeset
170
970
0304fc2bab15 pkg: prepare release of version 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 736
diff changeset
171 [ Julien Cristau ]
736
Julien Cristau <julien.cristau@logilab.fr>
parents: 721
diff changeset
172 * New upstream release.
Julien Cristau <julien.cristau@logilab.fr>
parents: 721
diff changeset
173
970
0304fc2bab15 pkg: prepare release of version 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 736
diff changeset
174 [ Pierre-Yves David ]
0304fc2bab15 pkg: prepare release of version 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 736
diff changeset
175 * new upstream release
0304fc2bab15 pkg: prepare release of version 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 736
diff changeset
176
1029
8012d2cfa254 evolve: fix distribution for 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 970
diff changeset
177 -- 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
178
721
26930fab9c8e update debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 628
diff changeset
179 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
180
26930fab9c8e update debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 628
diff changeset
181 * New upstream release.
26930fab9c8e update debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 628
diff changeset
182
26930fab9c8e update debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 628
diff changeset
183 -- 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
184
628
f9d305deeff3 [prepare] 2.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 613
diff changeset
185 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
186
f9d305deeff3 [prepare] 2.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 613
diff changeset
187 * New upstream release
f9d305deeff3 [prepare] 2.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 613
diff changeset
188
f9d305deeff3 [prepare] 2.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 613
diff changeset
189 -- 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
190
613
22cacfce2a65 fix version in setup.py
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 568
diff changeset
191 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
192
22cacfce2a65 fix version in setup.py
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 568
diff changeset
193 * New upstream release.
22cacfce2a65 fix version in setup.py
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 568
diff changeset
194
22cacfce2a65 fix version in setup.py
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 568
diff changeset
195 -- 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
196
568
e46a04302e4f upgrade debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 545
diff changeset
197 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
198
e46a04302e4f upgrade debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 545
diff changeset
199 * New upstream Release
e46a04302e4f upgrade debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 545
diff changeset
200
e46a04302e4f upgrade debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 545
diff changeset
201 -- 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
202
545
31932df8309a pkg: proper debian version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 544
diff changeset
203 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
204
4dba9a52dcab pkg: debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 531
diff changeset
205 * New bug fix release
4dba9a52dcab pkg: debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 531
diff changeset
206 * remove conflicting __init__.py
4dba9a52dcab pkg: debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 531
diff changeset
207
4dba9a52dcab pkg: debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 531
diff changeset
208 -- 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
209
531
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
210 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
211
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
212 * Initial release.
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
213
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
214 -- Julien Cristau <jcristau@debian.org> Fri, 24 Aug 2012 16:46:30 +0200