On 05/17/2015 10:16 AM, Jeroen Roovers wrote: > On Sun, 17 May 2015 06:08:56 +1000 > Michael Palimaka <kensing...@gentoo.org> wrote: > >>> 15 May 2015; Michael Palimaka <kensing...@gentoo.org> >>> kde4-base.eclass: Sync with KDE overlay - update SRC_URI. >>> >> >> This is a complete description of the changes made. > > OK, then that dash should be interpreted as an em dash, I guess, and > "Sync with KDE overlay" is a development note intended for that overlay > (yeah, we downstreamed that!) that accidentally slipped into the main > tree, adding nothing useful. > > > jer >
That is a limitation of CVS not being able to do actual merges. I'd say it's debatable whether "merge information" should be manually added to the ChangeLog entry. I think it can be left to the maintainer. The problem is only with those earliers ChangeLog entries that ONLY have that "merge information".