[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Merged Org 7.7

From: Glenn Morris
Subject: Re: Merged Org 7.7
Date: Wed, 17 Aug 2011 14:04:01 -0400
User-agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)

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.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]