1 test (2.0-1) unstable; urgency=low
3 * Version B with 2.0-1~exp3 contains only up to line 3 while version A
4 with 2.0-1 contains the 5 lines. The resulting version should have the
5 5 lines without conflict with Algorithm::Merge and a conflict without.
12 -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 18:23:09 +0200
14 test (2.0-1~exp3) unstable; urgency=low
16 * Version B with 2.0-1~exp3 contains only up to line 3 while version A
17 with 2.0-1 contains the 5 lines. The resulting version should have the
18 5 lines without conflict with Algorithm::Merge and a conflict without.
23 -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 18:23:09 +0200
25 test (1.2-2) unstable; urgency=low
27 * This is the last entry in changelog O.
29 -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 18:18:50 +0200
31 test (1.2-1) unstable; urgency=low
33 * This entry should not have conflicts with Algorithm::Merge installed.
34 * I'm the added line mentioned below (B-only).
35 * Changelog B should a have supplementary line above this one.
36 * Pi is 3.14 is true for all changelogs.
37 * Changelog A should have a supplementary line
38 somewhere in this sub-list
40 - Really no clouds in the sky
41 - Yet I'm hacking on dpkg
42 - What does that mean about me?
43 * This line should be shared but the next one is dropped in B only.
45 -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 18:09:07 +0200
47 test (1.1-1+conflict2) unstable; urgency=low
49 * This entry has a conflict on the next line.
55 * This line is the same in all 3 versions.
57 -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 18:07:40 +0200
60 test (1.1-1+conflict1) experimental; urgency=low
62 test (1.1-1+conflict1) unstable; urgency=high
65 * This entry has conflicts on the header line: A wants distribution
66 experimental (instead of unstable) and B wants urgency=high (instead
68 * But it also has a conflict on the trailer line. A changed the
69 timestamp to 18:05:00 and B to 18:06:00.
72 -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 18:05:00 +0200
74 -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 18:06:00 +0200
77 test (1.1-1+change2) unstable; urgency=low
79 * This entry is everywhere but the last line is different in A. The
80 merged version should have what's in A. Furthermore the timestamp in
81 B is set to 17:55:00, it should also be picked up.
82 * I'm definitely in changelog A.
84 -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 17:54:52 +0200
86 test (1.1-1+change1) unstable; urgency=high
88 * This entry is everywhere but the last line is different in B. The
89 merged version should have what's in B. Furthermore the urgency in
90 A is set to high, it should also be picked up.
91 * I'm definitely in changelog B.
93 -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 17:50:58 +0200
95 test (1.0-3+b) experimental; urgency=low
97 * This entry is present in B only. It's considered new and should thus
98 be in the merged changelog.
100 -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 17:47:38 +0200
102 test (1.0-3+a) experimental; urgency=low
104 * This entry is present in A only. It's considered new and should thus
105 be in the merged changelog.
107 -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 17:44:39 +0200
109 test (1.0-1) unstable; urgency=low
111 * Initial release. (Closes: #XXXXXX)
113 -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 17:37:46 +0200