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

[Raphaël Hertzog]

I committed a fix for this in the upstream git repository. Thanks for
the report.

http://anonscm.debian.org/gitweb/?p=dpkg/dpkg.git;a=commit;h=5c233019cc770fb59671090d4a9462adb149921f

** Changed in: dpkg (Ubuntu)
       Status: New => Fix Committed

-- 
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:
  Fix Committed

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