From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Joseph Myers Newsgroups: gmane.comp.lib.glibc.alpha Subject: Re: Update copyright dates not handled by scripts/update-copyrights [committed] Date: Mon, 2 Jan 2017 17:22:34 +0000 Message-ID: References: <0d577e78-86dc-5c4d-7afc-f4ff6e3a5eb9@redhat.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" X-Trace: blaine.gmane.org 1483377790 10923 195.159.176.226 (2 Jan 2017 17:23:10 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 2 Jan 2017 17:23:10 +0000 (UTC) User-Agent: Alpine 2.20 (DEB 67 2015-01-07) Cc: Florian Weimer , To: Paul Eggert Original-X-From: libc-alpha-return-76532-glibc-alpha=m.gmane.org@sourceware.org Mon Jan 02 18:22:57 2017 Return-path: Envelope-to: glibc-alpha@blaine.gmane.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:cc:subject:in-reply-to:message-id :references:mime-version:content-type; q=dns; s=default; b=sXF2c 7RdZqycvJBS7t/Fm5rS4EHoqJqGFrLqiRZZUUP0R1O6Px5iDIASfpUWxKTob6wTE fmZ/Xmr4B0qN5zXAFUdVNhnx2aR2pqSEtJUvD8g+eYFv/y3cOKgnOqHNBkRnQ0ba LaXDw7Ql0B+7ZzlXdJ5NASl0lYU1vwx3uc09Zc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:cc:subject:in-reply-to:message-id :references:mime-version:content-type; s=default; bh=1AKPqoBA8XT 2xisi1GawxuyBbQc=; b=tyCmqL5r6CqhWbKjfSXIK3paEjWwoihCzk+HHVNw0dk zBakg8J2sPpePFpPhbrNq9Oe6eIsl5CTtIlSq1O+/rfy5CGRnsAe1HQkEQqaHjEJ fEnvbVEzJdQL4msvZDxDp11+1XegvwVrpyZSG1LPr3B12JtwYJVQW+oSY0cMDx/w = Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Original-Sender: libc-alpha-owner@sourceware.org Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-HELO: relay1.mentorg.com In-Reply-To: X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) Xref: news.gmane.org gmane.comp.lib.glibc.alpha:68887 Archived-At: Received: from server1.sourceware.org ([209.132.180.131] helo=sourceware.org) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cO6Jz-00013g-HH for glibc-alpha@blaine.gmane.org; Mon, 02 Jan 2017 18:22:55 +0100 Received: (qmail 58161 invoked by alias); 2 Jan 2017 17:22:55 -0000 Received: (qmail 58149 invoked by uid 89); 2 Jan 2017 17:22:54 -0000 On Mon, 2 Jan 2017, Paul Eggert wrote: > Unfortunately there's a problem with this approach: it's a pain to merge. This > is because different branches can have different committed ChangeLog files, > which are mostly autogenerated but contain some hand edits. The autogenerated Since in practice we don't do point releases from branches in glibc, with my proposal (absent persuading the GCS maintainers of the non-utility for ChangeLogs in certain cases) ChangeLogs would most likely only ever be updated on master, not on branches. Branches would have commit messages following the relevant conventions, but the script probably wouldn't be run there. -- Joseph S. Myers joseph@codesourcery.com