On Sun, 17 May 2015 13:45:32 +0200
hasufell <hasuf...@gentoo.org> wrote:

> 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 

Use mgorny's pull request framework if you can't properly use CVS.
Somehow it manages to get it right and also happens to commit to 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.

https://devmanual.gentoo.org/ebuild-writing/misc-files/changelog/index.html#writing-correct-changelog-messages

Reply via email to