mdw@git.distorted.org.uk Git - dpkg/blob - scripts/t/merge_changelogs/ch-merged-pr

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