Repeated diff markers in the files

[Saša Bodiroža]

Hello,

Some of the diff markers in files are repeated. I noticed this in liferea sources downloaded from DaD. For example, in the beginning of ./configure file, there is a conflict mark like this:

<<<<<<< liferea-1.4.15-1 (Debian)
<<<<<<< liferea-1.4.15-1 (Debian)
<<<<<<< liferea-1.4.15-1 (Debian)
# Generated by GNU Autoconf 2.61 for liferea 1.4.15.
=======
# Generated by GNU Autoconf 2.61 for liferea 1.4.14.
>>>>>>> liferea-1.4.14-0ubuntu4 (Ubuntu)
=======
# Generated by GNU Autoconf 2.61 for liferea 1.4.14.
>>>>>>> liferea-1.4.14-0ubuntu4 (Ubuntu)
=======
# Generated by GNU Autoconf 2.61 for liferea 1.4.14.
>>>>>>> liferea-1.4.14-0ubuntu4 (Ubuntu)

The same conflict in the sources from MoM is presented in the correct way:

<<<<<<< liferea-1.4.14-0ubuntu4 (ubuntu)
# Generated by GNU Autoconf 2.61 for liferea 1.4.14.
=======
# Generated by GNU Autoconf 2.61 for liferea 1.4.15.
>>>>>>> liferea-1.4.15-1 (debian)

The difference is that DaD recognizes 1.4.11-1 as the base version, while MoM uses 1.4.12-1.

If you need any other information, feel free to ask.

[Saša Bodiroža (jazzva)]

I also forgot to add that reported files in REPORT for sources from DaD are:
  C ChangeLog
  C aclocal.m4
  C configure
  C configure.ac
  C debian/control
  C aclocal.m4
  C configure
  C configure
  C configure.ac
  C liferea.spec
  C src/webkit/webkit.c

In the REPORT for sources from MoM, the reported files are:
  C ChangeLog
  C aclocal.m4
  C configure
  C configure.ac
  C debian/control
  C* debian/patches/lua5.1.pc
  C* debian/patches/series
  C liferea.spec
  C src/webkit/webkit.c

[Adrien Cunin (adri2000)]

Thanks for your bug report.
I'm marking it as Won't fix as DaD is currently being merged into Merge-o-Matic, and we are not going to fix that kind of bug now. In the future (if you encounter such bugs in Merge-o-Matic), please provide the buggy generated files, as we may not be able to fetch them if the package is merged before we get to the bug report.