From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: Merged Org 7.7 Date: Wed, 17 Aug 2011 14:04:01 -0400 Message-ID: <5yfwkz9apa.fsf@fencepost.gnu.org> References: <87k4b2wgff.fsf@gnu.org> <0gmxfmtf4o.fsf@fencepost.gnu.org> <87k4aewwcb.fsf@gnu.org> <87zkjatgab.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1313604253 16089 80.91.229.12 (17 Aug 2011 18:04:13 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 17 Aug 2011 18:04:13 +0000 (UTC) Cc: emacs-devel@gnu.org To: Bastien Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 17 20:04:08 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QtkTI-0001Or-90 for ged-emacs-devel@m.gmane.org; Wed, 17 Aug 2011 20:04:08 +0200 Original-Received: from localhost ([::1]:38850 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtkTH-0006Uz-OM for ged-emacs-devel@m.gmane.org; Wed, 17 Aug 2011 14:04:07 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:45024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtkTF-0006Un-2P for emacs-devel@gnu.org; Wed, 17 Aug 2011 14:04:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QtkTD-0000TC-Vq for emacs-devel@gnu.org; Wed, 17 Aug 2011 14:04:05 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]:44885) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtkTD-0000T7-OZ for emacs-devel@gnu.org; Wed, 17 Aug 2011 14:04:03 -0400 Original-Received: from localhost ([127.0.0.1]:46996) by fencepost.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtkTB-0000fg-Hv; Wed, 17 Aug 2011 14:04:01 -0400 X-Spook: TWA kilo class arrangements class struggle argus Fedayeen X-Ran: [yWvguF&z?E? (Bastien's message of "Tue, 16 Aug 2011 01:18:36 +0200") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.10 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:143375 Archived-At: Bastien wrote: >> http://lists.gnu.org/archive/html/emacs-diffs/2011-08/msg00062.html >> http://lists.gnu.org/archive/html/emacs-diffs/2011-01/msg00156.html > > These emails are not the one about _your_ change, or do I miss > something? Yes, the change to copyright years was made in the emacs-23 branch by me, then merged to trunk by Stefan, so I believe the last one represents the relevant change. But perhaps I made other smaller changes after that to correct issues, I cannot remember. bzr log can show you all the revisions that affected a particular file. But I don't think that's the best way to do it. If you look at the diff corresponding to your initial merge of 7.7, and the more recent one for the etc and doc/misc directories, and just revert all the changes to the Copyright lines, that ought to fix it. Eg as I said -Copyright @copyright{} 2004-2011 Free Software Foundation, Inc. +Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Free Software Foundation, Inc.