From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: storm@cua.dk (Kim F. Storm) Newsgroups: gmane.emacs.devel Subject: Re: Years in copyright notices Date: 23 Jun 2004 11:58:42 +0200 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: References: <200406212046.i5LKkju24244@raven.dms.auburn.edu> <20040623082221.GA27982@fencepost> NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1087984760 2074 80.91.224.253 (23 Jun 2004 09:59:20 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 23 Jun 2004 09:59:20 +0000 (UTC) Cc: rms@gnu.org, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Wed Jun 23 11:59:04 2004 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1Bd4X1-0006T2-00 for ; Wed, 23 Jun 2004 11:59:03 +0200 Original-Received: from lists.gnu.org ([199.232.76.165]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1Bd4X1-0008BQ-00 for ; Wed, 23 Jun 2004 11:59:03 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1Bd4YM-0002yd-TD for emacs-devel@quimby.gnus.org; Wed, 23 Jun 2004 06:00:26 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1Bd4YH-0002xy-QY for emacs-devel@gnu.org; Wed, 23 Jun 2004 06:00:21 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1Bd4YF-0002xm-Sa for emacs-devel@gnu.org; Wed, 23 Jun 2004 06:00:21 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1Bd4YF-0002xj-Bz for emacs-devel@gnu.org; Wed, 23 Jun 2004 06:00:19 -0400 Original-Received: from [212.88.64.25] (helo=mail-relay.sonofon.dk) by monty-python.gnu.org with smtp (Exim 4.34) id 1Bd4WO-0004co-ND for emacs-devel@gnu.org; Wed, 23 Jun 2004 05:58:25 -0400 Original-Received: (qmail 14892 invoked from network); 23 Jun 2004 09:58:23 -0000 Original-Received: from unknown (HELO kfs-l.imdomain.dk.cua.dk) (213.83.150.2) by 0 with SMTP; 23 Jun 2004 09:58:23 -0000 Original-To: Miles Bader In-Reply-To: <20040623082221.GA27982@fencepost> Original-Lines: 35 User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.4 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:25210 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:25210 Miles Bader writes: > On Wed, Jun 23, 2004 at 10:08:41AM +0200, Kim F. Storm wrote: > > A Miles pointed out, this will lead to some merge conflicts, but since > > this is legal stuff, we have to accept that inconvenience. > > Richard's post indicated that we do _not_ have to `accept that > inconvenience', that it isn't a critical point. Right, but if we make an effort to bring this fully up-to-date, I suggest that we can just as well use the proper format. > Making sure the copyright notices include the appropriate years is reasonable > -- and probably won't result in all that many problems because many files are > already up-to-date -- but changing the date format is apparently not > necessary (according to Richard's post), and will result in many more > conflicts. Still, it will only result in conflicts in the files where you actually did update the copyright notice on the branch. If you didn't do that, there will be no conflicts. To me it doesn't make much sense to update the copyright on a "feature" branch, as it is likely to conflict with updates on the trunk. Some users have copyright-update in the save-buffer-hook, so maybe copyright-update should query vc to know if it's working on a branch and not do any update in that situation (or at least query the user). Of course, we also have release branches for maintenance releases, and we should update copyrights on those branches -- but then we normally don't merge to/from such branches. -- Kim F. Storm http://www.cua.dk