From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-dev+bounces-70447-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 3503A138CD2
	for <garchives@archives.gentoo.org>; Sun, 17 May 2015 11:46:01 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 04AA8E0875;
	Sun, 17 May 2015 11:45:54 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 1106FE081A
	for <gentoo-dev@lists.gentoo.org>; Sun, 17 May 2015 11:45:52 +0000 (UTC)
Received: from [192.168.0.12] (aftr-37-201-213-193.unity-media.net [37.201.213.193])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	(Authenticated sender: hasufell)
	by smtp.gentoo.org (Postfix) with ESMTPSA id A2BB034107D
	for <gentoo-dev@lists.gentoo.org>; Sun, 17 May 2015 11:45:51 +0000 (UTC)
Message-ID: <55587F5C.2060807@gentoo.org>
Date: Sun, 17 May 2015 13:45:32 +0200
From: hasufell <hasufell@gentoo.org>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0
Precedence: bulk
List-Post: <mailto:gentoo-dev@lists.gentoo.org>
List-Help: <mailto:gentoo-dev+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-dev+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-dev+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-dev.gentoo.org>
X-BeenThere: gentoo-dev@lists.gentoo.org
Reply-to: gentoo-dev@lists.gentoo.org
MIME-Version: 1.0
To: gentoo-dev@lists.gentoo.org
Subject: Re: [gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in eclass:
 ChangeLog kde5.eclass
References: <20150509102236.DF9B09D3@oystercatcher.gentoo.org>	<20150510064430.0a5dd2f9@pomiot.lan>	<20150516220435.5ea6b2e2@marga.jer-c2.orkz.net>	<mj884p$82i$1@ger.gmane.org> <20150517101620.0980c253@marga.jer-c2.orkz.net>
In-Reply-To: <20150517101620.0980c253@marga.jer-c2.orkz.net>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
X-Archives-Salt: eda6bdd2-5684-4f1e-bb12-407c7d45cdc1
X-Archives-Hash: b36c8e193b8ae59d03f927814486c13f

On 05/17/2015 10:16 AM, Jeroen Roovers wrote:
> On Sun, 17 May 2015 06:08:56 +1000
> Michael Palimaka <kensington@gentoo.org> wrote:
> 
>>>   15 May 2015; Michael Palimaka <kensington@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".