Gentoo Archives: gentoo-dev

From: Alexis Ballier <aballier@g.o>
To: gentoo-dev@l.g.o
Subject: Re: [gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde5.eclass
Date: Mon, 18 May 2015 07:47:53
Message-Id: 20150518094733.4927fa85@gentoo.org
In Reply to: Re: [gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde5.eclass by hasufell
1 On Sun, 17 May 2015 13:45:32 +0200
2 hasufell <hasufell@g.o> wrote:
3
4 > On 05/17/2015 10:16 AM, Jeroen Roovers wrote:
5 > > On Sun, 17 May 2015 06:08:56 +1000
6 > > Michael Palimaka <kensington@g.o> wrote:
7 > >
8 > >>> 15 May 2015; Michael Palimaka <kensington@g.o>
9 > >>> kde4-base.eclass: Sync with KDE overlay - update SRC_URI.
10 > >>>
11 > >>
12 > >> This is a complete description of the changes made.
13 > >
14 > > OK, then that dash should be interpreted as an em dash, I guess, and
15 > > "Sync with KDE overlay" is a development note intended for that
16 > > overlay (yeah, we downstreamed that!) that accidentally slipped
17 > > into the main tree, adding nothing useful.
18 > >
19 > >
20 > > jer
21 > >
22 >
23 > That is a limitation of CVS
24
25 Use mgorny's pull request framework if you can't properly use CVS.
26 Somehow it manages to get it right and also happens to commit to CVS...
27
28 > not being able to do actual merges. I'd
29 > say it's debatable whether "merge information" should be manually
30 > added to the ChangeLog entry. I think it can be left to the
31 > maintainer.
32
33 https://devmanual.gentoo.org/ebuild-writing/misc-files/changelog/index.html#writing-correct-changelog-messages