Repeated diff markers in the files
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Ubuntu DaD |
Won't Fix
|
Undecided
|
Unassigned |
Bug Description
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-
=======
# Generated by GNU Autoconf 2.61 for liferea 1.4.14.
>>>>>>> liferea-
=======
# Generated by GNU Autoconf 2.61 for liferea 1.4.14.
>>>>>>> liferea-
The same conflict in the sources from MoM is presented in the correct way:
<<<<<<< liferea-
# 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.
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: patches/ lua5.1. pc patches/ series
C ChangeLog
C aclocal.m4
C configure
C configure.ac
C debian/control
C* debian/
C* debian/
C liferea.spec
C src/webkit/webkit.c