Gentoo Archives: gentoo-dev

From: hasufell <hasufell@g.o>
To: gentoo-dev@l.g.o
Subject: Re: [gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde5.eclass
Date: Sun, 17 May 2015 11:46:01
Message-Id: 55587F5C.2060807@gentoo.org
In Reply to: Re: [gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde5.eclass by Jeroen Roovers
1 On 05/17/2015 10:16 AM, Jeroen Roovers wrote:
2 > On Sun, 17 May 2015 06:08:56 +1000
3 > Michael Palimaka <kensington@g.o> wrote:
4 >
5 >>> 15 May 2015; Michael Palimaka <kensington@g.o>
6 >>> kde4-base.eclass: Sync with KDE overlay - update SRC_URI.
7 >>>
8 >>
9 >> This is a complete description of the changes made.
10 >
11 > OK, then that dash should be interpreted as an em dash, I guess, and
12 > "Sync with KDE overlay" is a development note intended for that overlay
13 > (yeah, we downstreamed that!) that accidentally slipped into the main
14 > tree, adding nothing useful.
15 >
16 >
17 > jer
18 >
19
20 That is a limitation of CVS not being able to do actual merges. I'd say
21 it's debatable whether "merge information" should be manually added to
22 the ChangeLog entry. I think it can be left to the maintainer.
23
24 The problem is only with those earliers ChangeLog entries that ONLY have
25 that "merge information".

Replies