[Bug 815700] [NEW] dpkg-mergechangelogs emits non-standard conflict markers

[Andrew Bennetts]

Public bug reported:

dpkg-mergechangelogs emits conflict markers that differ from the those
produced by similar tools such as 'patch --merge', 'bzr merge', etc etc.
The de facto standard seems to be 7 chars: “<<<<<<<”, “=======”,
“>>>>>>>”.  dpkg-mergechangelogs only emits 6 chars.  Example output
snippet:

<<<<<<
  * Awesome bug fixes.
======
  * Yet another content for 1.1.1-2
>>>>>>

This has the potential to frustrate use of tools like meld that are
intended to help manually resolve conflicts (I don't know if meld
specifically is troubled by the difference, but there are many possible
tools developers might use to examine a conflicted merge).

This was noticed in the course of working on bug 718944 of bzr-builddeb.

** Affects: dpkg (Ubuntu)
     Importance: Undecided
         Status: New

-- 
You received this bug notification because you are a member of Ubuntu
Foundations Bugs, which is subscribed to dpkg in Ubuntu.
https://bugs.launchpad.net/bugs/815700

Title:
  dpkg-mergechangelogs emits non-standard conflict markers

Status in “dpkg” package in Ubuntu:
  New

Bug description:
  dpkg-mergechangelogs emits conflict markers that differ from the those
  produced by similar tools such as 'patch --merge', 'bzr merge', etc
  etc.  The de facto standard seems to be 7 chars: “<<<<<<<”, “=======”,
  “>>>>>>>”.  dpkg-mergechangelogs only emits 6 chars.  Example output
  snippet:

  <<<<<<
    * Awesome bug fixes.
  ======
    * Yet another content for 1.1.1-2
  >>>>>>

  This has the potential to frustrate use of tools like meld that are
  intended to help manually resolve conflicts (I don't know if meld
  specifically is troubled by the difference, but there are many
  possible tools developers might use to examine a conflicted merge).

  This was noticed in the course of working on bug 718944 of bzr-
  builddeb.

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/dpkg/+bug/815700/+subscriptions