From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 780AE138CD0 for ; Mon, 18 May 2015 07:47:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7EE97E096C; Mon, 18 May 2015 07:47:41 +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 A6DF6E0960 for ; Mon, 18 May 2015 07:47:40 +0000 (UTC) Received: from localhost (i19-les02-th2-5-48-220-179.sfr.lns.abo.bbox.fr [5.48.220.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: aballier) by smtp.gentoo.org (Postfix) with ESMTPSA id B2B45340D96 for ; Mon, 18 May 2015 07:47:39 +0000 (UTC) Date: Mon, 18 May 2015 09:47:33 +0200 From: Alexis Ballier To: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde5.eclass Message-ID: <20150518094733.4927fa85@gentoo.org> In-Reply-To: <55587F5C.2060807@gentoo.org> References: <20150509102236.DF9B09D3@oystercatcher.gentoo.org> <20150510064430.0a5dd2f9@pomiot.lan> <20150516220435.5ea6b2e2@marga.jer-c2.orkz.net> <20150517101620.0980c253@marga.jer-c2.orkz.net> <55587F5C.2060807@gentoo.org> Organization: Gentoo X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.27; x86_64-pc-linux-gnu) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Archives-Salt: 7a5d7d06-3a78-4edc-adfd-97f740338683 X-Archives-Hash: 3d64042c023d6914f89dd8381db39ec9 On Sun, 17 May 2015 13:45:32 +0200 hasufell wrote: > On 05/17/2015 10:16 AM, Jeroen Roovers wrote: > > On Sun, 17 May 2015 06:08:56 +1000 > > Michael Palimaka wrote: > > > >>> 15 May 2015; Michael Palimaka > >>> 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