~mdw / dpkg / blame
| Commit | Line | Data |
|---|---|---|
| 1479465f GJ |
1 | test (1.2-2) unstable; urgency=low |
| 2 | ||
| 3 | * This is the last entry in changelog O. | |
| 4 | ||
| 5 | -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 18:18:50 +0200 | |
| 6 | ||
| 7 | test (1.2-1) unstable; urgency=low | |
| 8 | ||
| 9 | * This entry should not have conflicts with Algorithm::Merge installed. | |
| 10 | * Changelog B should a have supplementary line above this one. | |
| 11 | * Pi is 3.14 is true for all changelogs. | |
| 12 | * Changelog A should have a supplementary line | |
| 13 | somewhere in this sub-list | |
| 14 | - The weather is nice | |
| 15 | - Yet I'm hacking on dpkg | |
| 16 | - What does that mean about me? | |
| 17 | * This line should be shared but the next one is dropped in B only. | |
| 18 | * If I'm here it's because the changelog is not B (I should not appear | |
| 19 | in the resulting changelog). | |
| 20 | ||
| 21 | -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 18:09:07 +0200 | |
| 22 | ||
| 23 | test (1.1-1+conflict2) unstable; urgency=low | |
| 24 | ||
| 25 | * This entry has a conflict on the next line. | |
| 26 | * I'm in changelog O (old). | |
| 27 | * This line is the same in all 3 versions. | |
| 28 | ||
| 29 | -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 18:07:40 +0200 | |
| 30 | ||
| 31 | test (1.1-1+conflict1) unstable; urgency=low | |
| 32 | ||
| 33 | * This entry has conflicts on the header line: A wants distribution | |
| 34 | experimental (instead of unstable) and B wants urgency=high (instead | |
| 35 | of low). | |
| 36 | * But it also has a conflict on the trailer line. A changed the | |
| 37 | timestamp to 18:05:00 and B to 18:06:00. | |
| 38 | ||
| 39 | -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 18:04:18 +0200 | |
| 40 | ||
| 41 | test (1.1-1+change2) unstable; urgency=low | |
| 42 | ||
| 43 | * This entry is everywhere but the last line is different in A. The | |
| 44 | merged version should have what's in A. Furthermore the timestamp in | |
| 45 | B is set to 17:55:00, it should also be picked up. | |
| 46 | * I'm not in changelog A. | |
| 47 | ||
| 48 | -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 17:54:52 +0200 | |
| 49 | ||
| 50 | test (1.1-1+change1) unstable; urgency=low | |
| 51 | ||
| 52 | * This entry is everywhere but the last line is different in B. The | |
| 53 | merged version should have what's in B. Furthermore the urgency in | |
| 54 | A is set to high, it should also be picked up. | |
| 55 | * I'm not in changelog B. | |
| 56 | ||
| 57 | -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 17:50:58 +0200 | |
| 58 | ||
| 59 | test (1.1-0.1) stable; urgency=low | |
| 60 | ||
| 61 | * This entry is present in O only, it should not appear in the merged | |
| 62 | changelog. | |
| 63 | ||
| 64 | -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 17:49:15 +0200 | |
| 65 | ||
| 66 | test (1.0-3) unstable; urgency=low | |
| 67 | ||
| 68 | * This entry is dropped in A only. | |
| 69 | * Since it's in O and B, it should not appear in the result. | |
| 70 | ||
| 71 | -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 17:41:31 +0200 | |
| 72 | ||
| 73 | test (1.0-2) unstable; urgency=low | |
| 74 | ||
| 75 | * This entry is dropped in B only. | |
| 76 | * Since it's in O and A, it should not appear in the result. | |
| 77 | * Pi is 3.14. | |
| 78 | ||
| 79 | -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 17:39:15 +0200 | |
| 80 | ||
| 81 | test (1.0-1) unstable; urgency=low | |
| 82 | ||
| 83 | * Initial release. (Closes: #XXXXXX) | |
| 84 | ||
| 85 | -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 17:37:46 +0200 |