~mdw / dpkg / blame
| Commit | Line | Data |
|---|---|---|
| 1479465f GJ |
1 | <<<<<<< |
| 2 | test (2.0-1) unstable; urgency=low | |
| 3 | ======= | |
| 4 | test (2.0-1~exp3) unstable; urgency=low | |
| 5 | >>>>>>> | |
| 6 | ||
| 7 | <<<<<<< | |
| 8 | * Version B with 2.0-1~exp3 contains only up to line 3 while version A | |
| 9 | with 2.0-1 contains the 5 lines. The resulting version should have the | |
| 10 | 5 lines without conflict with Algorithm::Merge and a conflict without. | |
| 11 | * Line 1. | |
| 12 | * Line 2. | |
| 13 | * Line 3. | |
| 14 | * Line 4. | |
| 15 | * Line 5. | |
| 16 | ======= | |
| 17 | * Version B with 2.0-1~exp3 contains only up to line 3 while version A | |
| 18 | with 2.0-1 contains the 5 lines. The resulting version should have the | |
| 19 | 5 lines without conflict with Algorithm::Merge and a conflict without. | |
| 20 | * Line 1. | |
| 21 | * Line 2. | |
| 22 | * Line 3. | |
| 23 | >>>>>>> | |
| 24 | ||
| 25 | -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 18:23:09 +0200 | |
| 26 | ||
| 27 | test (1.2-2) unstable; urgency=low | |
| 28 | ||
| 29 | * This is the last entry in changelog O. | |
| 30 | ||
| 31 | -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 18:18:50 +0200 | |
| 32 | ||
| 33 | test (1.2-1) unstable; urgency=low | |
| 34 | ||
| 35 | <<<<<<< | |
| 36 | * This entry should not have conflicts with Algorithm::Merge installed. | |
| 37 | * Changelog B should a have supplementary line above this one. | |
| 38 | * Pi is 3.14 is true for all changelogs. | |
| 39 | * Changelog A should have a supplementary line | |
| 40 | somewhere in this sub-list | |
| 41 | - The weather is nice | |
| 42 | - Really no clouds in the sky | |
| 43 | - Yet I'm hacking on dpkg | |
| 44 | - What does that mean about me? | |
| 45 | * This line should be shared but the next one is dropped in B only. | |
| 46 | * If I'm here it's because the changelog is not B (I should not appear | |
| 47 | in the resulting changelog). | |
| 48 | ======= | |
| 49 | * This entry should not have conflicts with Algorithm::Merge installed. | |
| 50 | * I'm the added line mentioned below (B-only). | |
| 51 | * Changelog B should a have supplementary line above this one. | |
| 52 | * Pi is 3.14 is true for all changelogs. | |
| 53 | * Changelog A should have a supplementary line | |
| 54 | somewhere in this sub-list | |
| 55 | - The weather is nice | |
| 56 | - Yet I'm hacking on dpkg | |
| 57 | - What does that mean about me? | |
| 58 | * This line should be shared but the next one is dropped in B only. | |
| 59 | >>>>>>> | |
| 60 | ||
| 61 | -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 18:09:07 +0200 | |
| 62 | ||
| 63 | test (1.1-1+conflict2) unstable; urgency=low | |
| 64 | ||
| 65 | <<<<<<< | |
| 66 | * This entry has a conflict on the next line. | |
| 67 | * I'm in changelog A. | |
| 68 | * This line is the same in all 3 versions. | |
| 69 | ======= | |
| 70 | * This entry has a conflict on the next line. | |
| 71 | * I'm in changelog B. | |
| 72 | * This line is the same in all 3 versions. | |
| 73 | >>>>>>> | |
| 74 | ||
| 75 | -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 18:07:40 +0200 | |
| 76 | ||
| 77 | <<<<<<< | |
| 78 | test (1.1-1+conflict1) experimental; urgency=low | |
| 79 | ======= | |
| 80 | test (1.1-1+conflict1) unstable; urgency=high | |
| 81 | >>>>>>> | |
| 82 | ||
| 83 | * This entry has conflicts on the header line: A wants distribution | |
| 84 | experimental (instead of unstable) and B wants urgency=high (instead | |
| 85 | of low). | |
| 86 | * But it also has a conflict on the trailer line. A changed the | |
| 87 | timestamp to 18:05:00 and B to 18:06:00. | |
| 88 | ||
| 89 | <<<<<<< | |
| 90 | -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 18:05:00 +0200 | |
| 91 | ======= | |
| 92 | -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 18:06:00 +0200 | |
| 93 | >>>>>>> | |
| 94 | ||
| 95 | test (1.1-1+change2) unstable; urgency=low | |
| 96 | ||
| 97 | * This entry is everywhere but the last line is different in A. The | |
| 98 | merged version should have what's in A. Furthermore the timestamp in | |
| 99 | B is set to 17:55:00, it should also be picked up. | |
| 100 | * I'm definitely in changelog A. | |
| 101 | ||
| 102 | -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 17:54:52 +0200 | |
| 103 | ||
| 104 | test (1.1-1+change1) unstable; urgency=high | |
| 105 | ||
| 106 | <<<<<<< | |
| 107 | * This entry is everywhere but the last line is different in B. The | |
| 108 | merged version should have what's in B. Furthermore the urgency in | |
| 109 | A is set to high, it should also be picked up. | |
| 110 | * I'm not in changelog B. | |
| 111 | ======= | |
| 112 | * This entry is everywhere but the last line is different in B. The | |
| 113 | merged version should have what's in B. Furthermore the urgency in | |
| 114 | A is set to high, it should also be picked up. | |
| 115 | * I'm definitely in changelog B. | |
| 116 | >>>>>>> | |
| 117 | ||
| 118 | -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 17:50:58 +0200 | |
| 119 | ||
| 120 | test (1.0-3+b) experimental; urgency=low | |
| 121 | ||
| 122 | * This entry is present in B only. It's considered new and should thus | |
| 123 | be in the merged changelog. | |
| 124 | ||
| 125 | -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 17:47:38 +0200 | |
| 126 | ||
| 127 | test (1.0-3+a) experimental; urgency=low | |
| 128 | ||
| 129 | * This entry is present in A only. It's considered new and should thus | |
| 130 | be in the merged changelog. | |
| 131 | ||
| 132 | -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 17:44:39 +0200 | |
| 133 | ||
| 134 | test (1.0-1) unstable; urgency=low | |
| 135 | ||
| 136 | * Initial release. (Closes: #XXXXXX) | |
| 137 | ||
| 138 | -- Raphaël Hertzog <hertzog@debian.org> Sun, 18 Apr 2010 17:37:46 +0200 |