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