From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R8y4r-0001JT-HY for garchives@archives.gentoo.org; Wed, 28 Sep 2011 17:37:49 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9645021C09D; Wed, 28 Sep 2011 17:37:40 +0000 (UTC) Received: from amun.cheops.ods.org (amun.cheops.ods.org [83.161.135.166]) by pigeon.gentoo.org (Postfix) with ESMTP id 13D8D21C081 for ; Wed, 28 Sep 2011 17:37:32 +0000 (UTC) Received: from nut.cheops.ods.org ([2001:888:1022:0:ca2a:14ff:fe35:7a00] helo=gentoo.org) by amun.cheops.ods.org with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1R8y4V-0002cg-Dt for gentoo-project@lists.gentoo.org; Wed, 28 Sep 2011 19:37:31 +0200 Date: Wed, 28 Sep 2011 19:37:26 +0200 From: Fabian Groffen To: gentoo-project@lists.gentoo.org Subject: Re: [gentoo-project] ChangeLog generation: Edit generated Changelogs Message-ID: <20110928173726.GC704@gentoo.org> Mail-Followup-To: gentoo-project@lists.gentoo.org References: <4E735841.9070209@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Project discussion list X-BeenThere: gentoo-project@lists.gentoo.org Reply-To: gentoo-project@lists.gentoo.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ERHfpFOxJvIsVBXy" Content-Disposition: inline In-Reply-To: <4E735841.9070209@gentoo.org> User-Agent: Mutt/1.5.21 (Darwin 11.1.0, VIM - Vi IMproved 7.3) Organization: Gentoo Foundation, Inc. X-Content-Scanned: by amun.cheops.ods.org (Exim Exiscan) using SpamAssassin and ClamAV X-Archives-Salt: X-Archives-Hash: 5dfed9997951547d2f08f933d84b97b2 --ERHfpFOxJvIsVBXy Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 16-09-2011 17:08:01 +0300, Markos Chandras wrote: > Council decided to push back to ML the remaining bullet point about > ChangeLog generation[1] I propose that the council reconsiders their answers to all of the questions, in particular the most important one "do we want ChangeLogs to be auto-generated". I propose instead that the council votes on NOT auto-generating ChangeLogs, but instead asks the Portage team to implement updating the ChangeLog file as part of repoman commit when there are files modified (includes removal) excluding the ChangeLog file itself. This solves most problems raised by council members, as well as others on the various threads on this topic. - The file can be edited (council intentional vote) - All existing information is retained (council vote) - Repoman updates ChangeLog so no filtering voodoo (council vote) - Works with AnyVCS and branches* - Needs no changes regarding Manifests, since ChangeLog is just in AnyVCS, known to repoman during commit * assuming the merger either uses plain commit before finally merging the changes to the final tree (and committing with repoman commit ther), or the merger simply resolves the conflict by discarding changelog changes and performing final repoman commit with a full message --=20 Fabian Groffen Gentoo on a different level --ERHfpFOxJvIsVBXy Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (Darwin) iEYEARECAAYFAk6DW1YACgkQX3X2B8XHTolsmACfQLcEZkB4LWhSlUSN+JPfC5/C vIwAn0iUdVPwBE7PecEP4CYvqsBalaRy =AQdz -----END PGP SIGNATURE----- --ERHfpFOxJvIsVBXy--